Blame proftpd-1.3.4a-bug3729.patch
|
 |
8abab90 |
Index: contrib/mod_ldap.c
|
|
|
8abab90 |
===================================================================
|
|
|
8abab90 |
RCS file: /cvsroot/proftp/proftpd/contrib/mod_ldap.c,v
|
|
|
8abab90 |
retrieving revision 1.94
|
|
|
8abab90 |
diff -u -r1.94 mod_ldap.c
|
|
|
8abab90 |
--- contrib/mod_ldap.c 18 Nov 2011 17:34:02 -0000 1.94
|
|
|
8abab90 |
+++ contrib/mod_ldap.c 7 Dec 2011 22:38:07 -0000
|
|
|
8abab90 |
@@ -1978,15 +1979,17 @@
|
|
|
8abab90 |
ldap_do_users = 1;
|
|
|
8abab90 |
ldap_user_basedn = pstrdup(session.pool, c->argv[0]);
|
|
|
8abab90 |
|
|
|
8abab90 |
- if (c->argv[1]) {
|
|
|
8abab90 |
+ if (c->argc > 1) {
|
|
|
8abab90 |
ldap_user_name_filter = pstrdup(session.pool, c->argv[1]);
|
|
|
8abab90 |
+
|
|
|
8abab90 |
} else {
|
|
|
8abab90 |
ldap_user_name_filter = pstrcat(session.pool,
|
|
|
8abab90 |
"(&(", ldap_attr_uid, "=%v)(objectclass=posixAccount))", NULL);
|
|
|
8abab90 |
}
|
|
|
8abab90 |
|
|
|
8abab90 |
- if (c->argv[2]) {
|
|
|
8abab90 |
+ if (c->argc > 2) {
|
|
|
8abab90 |
ldap_user_uid_filter = pstrdup(session.pool, c->argv[2]);
|
|
|
8abab90 |
+
|
|
|
8abab90 |
} else {
|
|
|
8abab90 |
ldap_user_uid_filter = pstrcat(session.pool,
|
|
|
8abab90 |
"(&(", ldap_attr_uidnumber, "=%v)(objectclass=posixAccount))", NULL);
|