1 |
vip-ire |
1.1 |
diff -up cpu-1.4.3/src/plugins/ldap/user.c.gid-not-supp cpu-1.4.3/src/plugins/ldap/user.c |
2 |
|
|
--- cpu-1.4.3/src/plugins/ldap/user.c.gid-not-supp 2010-11-07 21:51:45.000000000 -0700 |
3 |
|
|
+++ cpu-1.4.3/src/plugins/ldap/user.c 2010-11-07 22:01:26.000000000 -0700 |
4 |
|
|
@@ -402,33 +402,6 @@ ldapUserCheck (int mod_op, LDAP * ld) |
5 |
|
|
} |
6 |
|
|
} |
7 |
|
|
} |
8 |
|
|
- if (globalLdap->gid) |
9 |
|
|
- { |
10 |
|
|
- tcn = cfg_get_str ("LDAP", "GROUP_CN_STRING"); |
11 |
|
|
- if (tcn == NULL) |
12 |
|
|
- tcn = strdup ("cn"); |
13 |
|
|
- strsize = strlen (globalLdap->gid) + |
14 |
|
|
- strlen (gf) + strlen (tcn) + 8; |
15 |
|
|
- filter2 = (char *) malloc (sizeof (char) * strsize); |
16 |
|
|
- if (filter2 == NULL) |
17 |
|
|
- return -1; |
18 |
|
|
- bzero (filter2, strsize); |
19 |
|
|
- snprintf (filter2, strsize, "(&%s (%s=%s))", |
20 |
|
|
- gf, tcn, globalLdap->gid); |
21 |
|
|
- if (ldap_search_st |
22 |
|
|
- (ld, globalLdap->group_base, LDAP_SCOPE_SUBTREE, filter2, |
23 |
|
|
- attrs, 0, &globalLdap->timeout, res) != LDAP_SUCCESS) |
24 |
|
|
- { |
25 |
|
|
- CPU_ldapPerror (ld, globalLdap, |
26 |
|
|
- "ldapUserCheck: ldap_search_st"); |
27 |
|
|
- return -1; |
28 |
|
|
- } |
29 |
|
|
- ldapres = ldap_count_entries (ld, res[0]); |
30 |
|
|
- if (ldapres > 0) |
31 |
|
|
- { |
32 |
|
|
- ldap_modify_s (ld, ldap_get_dn (ld, res[0]), tmod); |
33 |
|
|
- } |
34 |
|
|
- } |
35 |
|
|
free (gf); |
36 |
|
|
} |
37 |
|
|
if (globalLdap->first_name) |