Make ldap config file clearer

diff --git a/config-lib.pl b/config-lib.pl
index fa9de67..ad3201b 100644 (file)
--- a/config-lib.pl
+++ b/config-lib.pl
@@ -122,9 +122,9 @@ foreach $c (@info_order) {
                }
        elsif ($p[1] == 3) {
                # Optional value
-               local $none = $p[2] ? $p[2] : $text{'config_none'};
+               local $none = $p[2] || $text{'config_none'};
                $field = &ui_opt_textbox($c, $config{$c}, $p[3] || 20, $none,
-                                        undef, 0, undef, $p[4])." ".$p[5];
+                                        $p[6], 0, undef, $p[4])." ".$p[5];
                }
        elsif ($p[1] == 4) {
                # One of many menu

diff --git a/ldap-useradmin/config.info b/ldap-useradmin/config.info
index 26da513..7886f9d 100644 (file)
--- a/ldap-useradmin/config.info
+++ b/ldap-useradmin/config.info
@@ -1,5 +1,5 @@
 line1=LDAP server options,11
-auth_ldap=Linux LDAP NSS library config file,3,None
+auth_ldap=Linux LDAP NSS library config file,3,None (use settings below),40,,,Use settings from file
 ldap_host=LDAP server host,3,From NSS config file
 ldap_port=LDAP server port,3,From NSS config file or default
 ldap_tls=LDAP server uses TLS?,1,1-Yes,0-No