1 --- openssh-5.9p1/./ldap-helper.c~ 2011-09-29 00:38:28.000000000 +0300
2 +++ openssh-5.9p1/./ldap-helper.c 2011-09-29 00:54:04.004223268 +0300
5 static int config_debug = 0;
6 int config_exclusive_config_file = 0;
7 -static char *config_file_name = "/etc/ssh/ldap.conf";
8 +static char *config_file_name = "/etc/ldap.conf";
9 static char *config_single_user = NULL;
10 static int config_verbose = SYSLOG_LEVEL_VERBOSE;
11 int config_warning_config_file = 0;
13 fprintf(stderr, "Options:\n");
14 fprintf(stderr, " -d Output the log messages to stderr.\n");
15 fprintf(stderr, " -e Check the config file for unknown commands.\n");
16 - fprintf(stderr, " -f file Use alternate config file (default is /etc/ssh/ldap.conf).\n");
17 + fprintf(stderr, " -f file Use alternate config file (default is /etc/ldap.conf).\n");
18 fprintf(stderr, " -s user Do not demonize, send the user's key to stdout.\n");
19 fprintf(stderr, " -v Increase verbosity of the debug output (implies -d).\n");
20 fprintf(stderr, " -w Warn on unknown commands in the config file.\n");
21 --- openssh-5.9p1/./ssh-ldap-helper.8~ 2011-09-29 00:38:28.000000000 +0300
22 +++ openssh-5.9p1/./ssh-ldap-helper.8 2011-09-29 00:54:14.308032118 +0300
24 halts if it encounters an unknown item in the ldap.conf file.
27 -uses this file as the ldap configuration file instead of /etc/ssh/ldap.conf (default).
28 +uses this file as the ldap configuration file instead of /etc/ldap.conf (default).
31 prints out the user's keys to stdout and exits.
32 --- openssh-5.9p1/./ssh-ldap.conf.5~ 2011-09-29 00:38:28.000000000 +0300
33 +++ openssh-5.9p1/./ssh-ldap.conf.5 2011-09-29 00:54:40.285897653 +0300
36 .Nd configuration file for ssh-ldap-helper
38 -.Nm /etc/ssh/ldap.conf
42 reads configuration data from
43 -.Pa /etc/ssh/ldap.conf
45 (or the file specified with
52 -.It Pa /etc/ssh/ldap.conf
53 +.It Pa /etc/ldap.conf
54 Ldap configuration file for
55 .Xr ssh-ldap-helper 8 .