1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
diff -rc /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/cache.c ./src/modules/ldap/cache.c
*** /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/cache.c Tue Oct 9 10:34:51 2001
--- ./src/modules/ldap/cache.c Wed May 5 01:51:16 2004
***************
*** 278,285 ****
} else
if(!strcasecmp(attr, "userpassword"))
{
! pwinfo->userpassword = fix_password(values);
! pwinfo->size += strlen(pwinfo->userpassword);
} else
if(!strcasecmp(attr, "uidnumber"))
{
--- 278,285 ----
} else
if(!strcasecmp(attr, "userpassword"))
{
! pwinfo->userpassword = safe_strdup("*");
! pwinfo->size += strlen("*");
} else
if(!strcasecmp(attr, "uidnumber"))
{
***************
*** 322,327 ****
--- 322,394 ----
return (rval);
}
+ int assemble_master_passwd(valdat *val, LDAPMessage *user, struct pwinfo *pwinfo)
+ {
+ ypstat rval;
+ char *attr;
+ BerElement *ber = NULL;
+
+ rval = YP_YPERR;
+ fill_pwinfo(pwinfo);
+
+ for (attr = ldap_first_attribute (ldaprefs.ldap, user, &ber); attr; attr = ldap_next_attribute (ldaprefs.ldap, user, ber))
+ {
+ char **values;
+
+ values = ldap_get_values (ldaprefs.ldap, user, attr);
+ if (values)
+ {
+ if(!strcasecmp(attr, "uid"))
+ {
+ pwinfo->uid = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ } else
+ if(!strcasecmp(attr, "userpassword"))
+ {
+ pwinfo->userpassword = fix_password(values);
+ pwinfo->size += strlen(pwinfo->userpassword);
+ } else
+ if(!strcasecmp(attr, "uidnumber"))
+ {
+ pwinfo->uidnumber = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ } else
+ if(!strcasecmp(attr, "gidnumber"))
+ {
+ pwinfo->gidnumber = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ } else
+ if(!strcasecmp(attr, "gecos"))
+ {
+ pwinfo->gecos = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ } else
+ if(!strcasecmp(attr, "homedirectory"))
+ {
+ pwinfo->homedirectory = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ } else
+ if(!strcasecmp(attr, "loginshell"))
+ {
+ pwinfo->loginshell = safe_strdup(values[0]);
+ pwinfo->size += strlen(values[0]);
+ }
+ ldap_value_free(values);
+ }
+ }
+ if (check_pwinfo(pwinfo) == YP_TRUE)
+ {
+ val->valdat_len = pwinfo->size + MPWLINE_SIZE;
+ val->valdat_val = safe_malloc(val->valdat_len + 1);
+ sprintf(val->valdat_val, MPWLINE, pwinfo->uid, pwinfo->userpassword, pwinfo->uidnumber, pwinfo->gidnumber, pwinfo->gecos, pwinfo->homedirectory, pwinfo->loginshell);
+ rval = YP_TRUE;
+ } else {
+ rval = YP_NOKEY;
+ }
+
+ return (rval);
+ }
+
int assemble_group(valdat *val, LDAPMessage *group, struct gwinfo *gwinfo)
{
ypstat rval;
***************
*** 538,548 ****
free(filter);
free(base);
}
else if (!strcmp((char *) mapcache_current->map, "group.byname"))
{
/* XXX Add preferences for filter and basedn */
base = safe_malloc(strlen(ldaprefs.basedn) + strlen("ou=Group,") + 1);
sprintf(base, "%s%s", "ou=Group,", ldaprefs.basedn);
filter = safe_strdup("(objectClass=posixGroup)");
if(ldap_search_s(ldaprefs.ldap,
--- 605,689 ----
free(filter);
free(base);
}
+ else if (!strcmp((char *) mapcache_current->map, "master.passwd.byname"))
+ {
+ /* XXX Add preferences for filter and basedn */
+ base = safe_malloc(strlen(ldaprefs.basedn) + strlen("ou=Staffs,") + 1);
+ sprintf(base, "%s%s", "ou=Staffs,", ldaprefs.basedn);
+ filter = safe_strdup("(objectClass=posixAccount)");
+
+ if(ldap_search_s(ldaprefs.ldap,
+ base,
+ LDAP_SCOPE_ONELEVEL,
+ filter,
+ user_attributes,
+ 0,
+ &ldapreturn) != -1)
+ {
+ for (record = ldap_first_entry(ldaprefs.ldap, ldapreturn); record; record = ldap_next_entry(ldaprefs.ldap, record))
+ {
+ pwinfo = safe_malloc(sizeof(struct pwinfo));
+ rval = assemble_master_passwd(val, record, pwinfo);
+ if(rval == YP_TRUE);
+ {
+ if(check_unique(mapcache_current, pwinfo->uid) == YP_NOKEY)
+ {
+ mapentry_current = safe_malloc(sizeof(struct mapentry));
+ mapentry_current->key = safe_strdup(pwinfo->uid);
+ mapentry_current->val = val->valdat_val;
+ mapentry_current->next = mapcache_current->mapentry;
+ mapcache_current->mapentry = mapentry_current;
+ }
+ }
+ clean_pwinfo(pwinfo);
+ }
+ }
+ ldap_msgfree(ldapreturn);
+ free(filter);
+ free(base);
+ }
+ else if (!strcmp((char *) mapcache_current->map, "master.passwd.byuid"))
+ {
+ /* XXX Add preferences for filter and basedn */
+ base = safe_malloc(strlen(ldaprefs.basedn) + strlen("ou=Staffs,") + 1);
+ sprintf(base, "%s%s", "ou=Staffs,", ldaprefs.basedn);
+ filter = safe_strdup("(objectClass=posixAccount)");
+
+ if(ldap_search_s(ldaprefs.ldap,
+ base,
+ LDAP_SCOPE_ONELEVEL,
+ filter,
+ user_attributes,
+ 0,
+ &ldapreturn) != -1)
+ {
+ for (record = ldap_first_entry(ldaprefs.ldap, ldapreturn); record; record = ldap_next_entry(ldaprefs.ldap, record))
+ {
+ pwinfo = safe_malloc(sizeof(struct pwinfo));
+ rval = assemble_master_passwd(val, record, pwinfo);
+ if(rval == YP_TRUE);
+ {
+ if(check_unique(mapcache_current, pwinfo->uidnumber) == YP_NOKEY)
+ {
+ mapentry_current = safe_malloc(sizeof(struct mapentry));
+ mapentry_current->key = safe_strdup(pwinfo->uidnumber);
+ mapentry_current->val = val->valdat_val;
+ mapentry_current->next = mapcache_current->mapentry;
+ mapcache_current->mapentry = mapentry_current;
+ }
+ }
+ clean_pwinfo(pwinfo);
+ }
+ }
+ ldap_msgfree(ldapreturn);
+ free(filter);
+ free(base);
+ }
else if (!strcmp((char *) mapcache_current->map, "group.byname"))
{
/* XXX Add preferences for filter and basedn */
base = safe_malloc(strlen(ldaprefs.basedn) + strlen("ou=Group,") + 1);
sprintf(base, "%s%s", "ou=Group,", ldaprefs.basedn);
filter = safe_strdup("(objectClass=posixGroup)");
if(ldap_search_s(ldaprefs.ldap,
diff -rc /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/ldap.c ./src/modules/ldap/ldap.c
*** /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/ldap.c Wed Oct 3 09:45:29 2001
--- ./src/modules/ldap/ldap.c Wed May 5 01:39:20 2004
***************
*** 60,66 ****
--- 60,69 ----
#include "cache.h"
#define CONFIG_FILE CONFDIR "/ldap.conf"
+ /*
#define MAPS "auto.home auto_home amd.home passwd.byname passwd.byuid group.byname group.bygid"
+ */
+ #define MAPS "auto.home auto_home amd.home master.passwd.byname master.passwd.byuid passwd.byname passwd.byuid group.byname group.bygid"
struct ldaprefs ldaprefs;
diff -rc /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/ldap.h ./src/modules/ldap/ldap.h
*** /services/build/usr/ports/net/yptransitd/work/yptransitd-0.5/src/modules/ldap/ldap.h Wed Oct 3 08:59:53 2001
--- ./src/modules/ldap/ldap.h Wed May 5 01:49:57 2004
***************
*** 42,47 ****
--- 42,50 ----
#define PWLINE "%s:%s:%s:%s:%s:%s:%s"
#define PWLINE_SIZE 6
+ #define MPWLINE "%s:%s:%s:%s::0:0:%s:%s:%s"
+ #define MPWLINE_SIZE 11
+
#define GWLINE "%s:%s:%s:%s"
#define GWLINE_SIZE 3
|
