6267517 gcc/g++ and cmd/ldap don't get along

6269029 cmd/ypcmd and gcc don't get along
6271235 gcc and cmd/ldapcachemgr don't get along
6274678 gcc and libnisdb don't get along

2 files changed, 11 insertions, 9 deletions

diff --git a/usr/src/cmd/ldap/common/common.c b/usr/src/cmd/ldap/common/common.c
index 5c58467f77..ebffd2b017 100755
--- a/usr/src/cmd/ldap/common/common.c
+++ b/usr/src/cmd/ldap/common/common.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-/* 
+/*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of
@@ -138,7 +138,7 @@ ldaptool_common_usage( int two_hosts )
     fprintf( stderr, gettext("    -W\t\tSSL key password\n") );
 #ifndef SOLARIS_LDAP_CMD
     fprintf( stderr, gettext("    -3\t\tcheck hostnames in SSL certificates\n") );
-#endif	/SOLARIS_LDAP_CMD */
+#endif	/* SOLARIS_LDAP_CMD */
 
 #ifdef LDAP_TOOL_PKCS11
     fprintf( stderr, gettext("    -Q [token][:certificate name]\tPKCS 11\n") );
diff --git a/usr/src/cmd/ldap/common/ldapmodrdn.c b/usr/src/cmd/ldap/common/ldapmodrdn.c
index 51db1b7fe2..895e11fa9d 100644
--- a/usr/src/cmd/ldap/common/ldapmodrdn.c
+++ b/usr/src/cmd/ldap/common/ldapmodrdn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -35,9 +35,8 @@ static void usage( void )
 	exit(LDAP_PARAM_ERROR );
 }
 
-int main( argc, argv )
-int		argc;
-char	**argv;
+int 
+main(int argc, char **argv )
 {
 	char *myname, *entrydn, *rdn, buf[ 4096 ];
 	int rc, havedn, deref, optind;
@@ -53,7 +52,10 @@ char	**argv;
 
 	contoper =  remove_oldrdn = 0;
 
-	myname = (myname = strrchr(argv[0], '/')) == NULL ? argv[0] : ++myname;
+	if ((myname = strrchr(argv[0], '/')) == NULL)
+		myname = argv[0];
+	else
+		++myname;
 
 	optind = ldaptool_process_args( argc, argv, "cr", 0, options_callback);
 	
@@ -224,7 +226,7 @@ domodrdn( LDAP *ld, char *dn, char *rdn, char *newsuperior, int remove_oldrdn )
 
 	if ( ldaptool_verbose )
 		printf( gettext("new RDN: %1$s (%2$skeep existing values)\n"),
-						rdn, remove ? "do not " : "" );
+						rdn, remove_oldrdn ? "do not " : "" );
  
 	printf( gettext("%1$srenaming entry %2$s\n"), 
 			ldaptool_not ? "!" : "", dn );