1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' cpu-1.4.3/src/plugins/ldap/commandline.c mezzanine_patched_cpu-1.4.3/src/plugins/ldap/commandline.c |
2 |
|
|
--- cpu-1.4.3/src/plugins/ldap/commandline.c 2004-01-12 00:31:02.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_cpu-1.4.3/src/plugins/ldap/commandline.c 2007-07-24 14:55:44.000000000 -0400 |
4 |
|
|
@@ -83,7 +83,7 @@ |
5 |
|
|
if (passent == NULL) |
6 |
|
|
return -1; |
7 |
|
|
bzero (passent, sizeof (struct cpass)); |
8 |
|
|
- (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; |
9 |
|
|
+ passent->sp_lstchg = (int)(passent->sp_min = passent->sp_max = -10); |
10 |
|
|
passent->sp_warn = passent->sp_inact = passent->sp_expire = -10; |
11 |
|
|
passent->sp_flag = -10; |
12 |
|
|
passent->pw_gid = -10; |
13 |
|
|
diff -Nur -x '*.orig' -x '*.rej' cpu-1.4.3/src/plugins/ldap/ld.c mezzanine_patched_cpu-1.4.3/src/plugins/ldap/ld.c |
14 |
|
|
--- cpu-1.4.3/src/plugins/ldap/ld.c 2004-01-11 23:47:37.000000000 -0500 |
15 |
|
|
+++ mezzanine_patched_cpu-1.4.3/src/plugins/ldap/ld.c 2007-07-24 14:56:36.000000000 -0400 |
16 |
|
|
@@ -803,11 +803,14 @@ |
17 |
|
|
return -10; |
18 |
|
|
if (gid != NULL) |
19 |
|
|
{ |
20 |
|
|
- gid = ldap_get_values (ld, pos, gid)[0]; |
21 |
|
|
- if (gid != NULL) |
22 |
|
|
- return atoi (gid); |
23 |
|
|
- else |
24 |
|
|
- return -10; |
25 |
|
|
+ char **gidval = ldap_get_values (ld, pos, gid); |
26 |
|
|
+ int val; |
27 |
|
|
+ |
28 |
|
|
+ if (gidval == NULL) |
29 |
|
|
+ return -10; |
30 |
|
|
+ val = atoi (*gidval); |
31 |
|
|
+ ldap_value_free (gidval); |
32 |
|
|
+ return val; |
33 |
|
|
} |
34 |
|
|
else |
35 |
|
|
return -10; |