From 122099d40aac0f202e125e977f10f39494a781fe Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 21:59:33 +0000
Subject: [PATCH] cleanup
---
clients/tools/common.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/clients/tools/common.c b/clients/tools/common.c
index 0a503818e2..7606f99a9e 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -599,6 +599,19 @@ tool_args( int argc, char **argv )
}
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ } else if ( strcasecmp( control, "sessiontracking" ) == 0 ) {
+ if ( sessionTracking ) {
+ fprintf( stderr, "%s: session tracking can be only specified once\n", prog );
+ exit( EXIT_FAILURE );
+ }
+ sessionTracking = 1;
+ if( crit ) {
+ fprintf( stderr, "sessiontracking: critical flag not allowed\n" );
+ usage();
+ }
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+
/* this shouldn't go here, really; but it's a feature... */
} else if ( strcasecmp( control, "abandon" ) == 0 ) {
abcan = Intr_Abandon;
@@ -618,15 +631,6 @@ tool_args( int argc, char **argv )
gotintr = abcan;
}
-#ifdef LDAP_CONTROL_X_SESSION_TRACKING
- } else if ( strcasecmp( control, "sessiontracking" ) == 0 ) {
- if ( sessionTracking ) {
- fprintf( stderr, "%s: session tracking can be only specified once\n", prog );
- exit( EXIT_FAILURE );
- }
- sessionTracking = 1;
-#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
-
} else if ( tool_is_oid( control ) ) {
LDAPControl *tmpctrls, ctrl;
--
GitLab