svn rev #21625: trunk/src/plugins/kdb/ldap/ldap_util/

[epeisach@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21625
Commit By: epeisach
Log Message:
Add prototype for usage.  Change invocation of usage to db_usage when using an argument. Include adm_proto.h for prototype for krb5_keysalt_iterate.




Changed Files:
U   trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
U   trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
U   trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h
Modified: trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c	2008-12-29 06:01:42 UTC (rev 21624)
+++ trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c	2008-12-29 12:36:31 UTC (rev 21625)
@@ -87,6 +87,7 @@
 #include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
+#include <adm_proto.h>
 #include "kdb5_ldap_util.h"
 #include "kdb5_ldap_list.h"
 #include <ldap_principal.h>
@@ -2004,7 +2005,7 @@
 static void print_realm_params(krb5_ldap_realm_params *rparams, int mask)
 {
     char **slist = NULL;
-    int num_entry_printed = 0, i = 0;
+    unsigned int num_entry_printed = 0, i = 0;
 
     /* Print the Realm Attributes on the standard output */
     printf("%25s: %-50s\n", "Realm Name", global_params.realm);

Modified: trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c	2008-12-29 06:01:42 UTC (rev 21624)
+++ trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c	2008-12-29 12:36:31 UTC (rev 21625)
@@ -104,7 +104,7 @@
  * This function prints the usage of kdb5_ldap_util, which is
  * the LDAP configuration utility.
  */
-void usage()
+void usage(void)
 {
     fprintf(stderr, "Usage: "
 "kdb5_ldap_util [-D user_dn [-w passwd]] [-H ldapuri]\n"
@@ -420,7 +420,6 @@
      * we will print the help corresponding to the sub-command.
      */
     if (print_help_message) {
-	char *cmd_name = cmd_argv[0];
 	free(cmd_argv);
 	cmd_argv = NULL;
 	usage();

Modified: trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h	2008-12-29 06:01:42 UTC (rev 21624)
+++ trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h	2008-12-29 12:36:31 UTC (rev 21625)
@@ -63,10 +63,10 @@
 extern int exit_status;
 extern krb5_context util_context;
 
-extern void usage();
+extern void usage(void);
 extern void db_usage(int);
 
-#define ARG_VAL (--argc > 0 ? (koptarg = *(++argv)) : (char *)(usage(MAIN_HELP), NULL))
+#define ARG_VAL (--argc > 0 ? (koptarg = *(++argv)) : (char *)(db_usage(MAIN_HELP), NULL))
 
 /* Following are the bitmaps that indicate which of the options among -D, -w, -h, -p & -t
  * were specified on the command line.