Savitha's patches for:

- LDAP URI support for specifying server and port
- support for ldapi interface
- updated to newer LDAP APIs
- updated documentation

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18592 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 6 insertions, 22 deletions

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
index 5ff7615f12..ca08ef9fdf 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M
@@ -4,7 +4,7 @@ kdb5_ldap_util \- Kerberos Configuration Utility
 .SH SYNOPSIS
 .B kdb5_ldap_util
 [\fB\-D\fP\ \fIuser_dn\fP [\fB\-w\fP\ \fIpasswd\fP]]
-[\fB\-h\fP\ \fIldap_server\fP] [\fB\-p\fP\ \fIldap_port\fP]
+[\fB\-H\fP\ \fIldapuri\fP]
 .I command
 .I [command_options]
 .SH DESCRIPTION
@@ -21,12 +21,8 @@ Specifies the password of
 .IR user_dn .
 This option is not recommended.
 .TP
-\fB\-h\fP\ \fIldap_server\fP
-Specifies the hostname or IP address of the server hosting the LDAP service for 
-a Kerberos realm.
-.TP
-\fB\-p\fP\ \fIldap_port\fP
-Specifies the SSL port number of the LDAP server.
+\fB\-H\fP\ \fIldapuri\fP
+Specifies the URI of the LDAP server.
 .SH COMMANDS
 .TP
 \fBcreate\fP [\fB\-subtree\fP\ \fIsubtree_dn\fP] [\fB\-sscope\fP\ \fIsearch_scope\fP] [\fB\-k\fP\ \fImkeytype\fP] [\fB\-m\fP|\fB\-P\fP\ \fIpassword\fP|\fB\-sf\fP\ \fIstashfilename\fP] [\fB\-r\fP\ \fIrealm\fP] [\fB\-kdcdn\fP\ \fIkdc_service_list\fP] [\fB\-admindn\fP\ \fIadmin_service_list\fP] [\fB\-pwddn\fP\ \fIpasswd_service_list\fP] [\fB\-maxtktlife\fP\ \fImax_ticket_life\fP] [\fB\-maxrenewlife\fP\ \fImax_renewable_ticket_life\fP] [\fIticket_flags\fP]
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
index be9ae0c6fb..d5e7134e4f 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -107,7 +107,7 @@ krb5_boolean manual_mkey = FALSE;
 void usage()
 {
     fprintf(stderr, "Usage: "
-"kdb5_ldap_util [-D user_dn [-w passwd]] [-h ldap_server] [-p ldap_port]\n"
+"kdb5_ldap_util [-D user_dn [-w passwd]] [-H ldapuri]\n"
 "\tcmd [cmd_options]\n"
 
 /* Create realm */
@@ -116,7 +116,7 @@ void usage()
 "\t\t[-kdcdn kdc_service_list] [-admindn admin_service_list]\n"
 "\t\t[-pwddn passwd_service_list]\n"
 #endif
-"\t\t[-m|-P password|-sf stashfilename] [-k mkeytype]\n"
+"\t\t[-m|-P password|-sf stashfilename] [-k mkeytype] [-s]\n"
 "\t\t[-maxtktlife max_ticket_life] [-maxrenewlife max_renewable_ticket_life]\n"
 "\t\t[ticket_flags] [-r realm]\n"
 
@@ -373,7 +373,7 @@ int main(argc, argv)
 		goto cleanup;
 	    }
 	    ldapmask |= CMD_LDAP_W;
-	} else if (strcmp(*argv, "-h") == 0 && ARG_VAL) {
+	} else if (strcmp(*argv, "-H") == 0 && ARG_VAL) {
 	    ldap_server = koptarg;
 	    if (ldap_server == NULL) {
 		com_err(progname, ENOMEM, "while reading ldap parameters");
@@ -381,14 +381,6 @@ int main(argc, argv)
 		goto cleanup;
 	    }
 	    ldapmask |= CMD_LDAP_H;
-	} else if (strcmp(*argv, "-p") == 0 && ARG_VAL) {
-	    ldap_port = koptarg;
-	    if (ldap_port == NULL) {
-		com_err(progname, ENOMEM, "while reading ldap parameters");
-		exit_status++;
-		goto cleanup;
-	    }
-	    ldapmask |= CMD_LDAP_P;
 	} else if (cmd_lookup(*argv) != NULL) {
 	    if (cmd_argv[0] == NULL)
 		cmd_argv[0] = *argv;
@@ -562,10 +554,6 @@ int main(argc, argv)
 	    goto cleanup;
 	}
     }
-    /* If ldapport is specified, release entry filled by configuration & use this*/
-    if (ldapmask & CMD_LDAP_P) {
-	ldap_context->port = atoi(ldap_port);
-    }
     if (bind_dn) {
 	ldap_context->bind_dn = strdup(bind_dn);
 	if (ldap_context->bind_dn == NULL) {