View | Details | Raw Unified | Return to bug 9225
Collapse All | Expand All

(-)smbldap-tools-0.9.1.orig/smbldap-groupadd (+4 lines)
Lines 124-129 Link Here
124
					     }
124
					     }
125
				    );
125
				    );
126
  $modify->code && warn "failed to delete entry: ", $modify->error ;
126
  $modify->code && warn "failed to delete entry: ", $modify->error ;
127
  if (defined $config{idmapinplace} ) {
128
      $modify = $ldap_master->modify ( "cn=$_groupName,$config{groupsdn}",changes => [add => [objectClass => 'sambaIdmapEntry'] ] );
129
      $modify->code && die "failed to add in-place idmap entry: ", $modify->error ;
130
  };
127
}
131
}
128
132
129
# take down session
133
# take down session
(-)smbldap-tools-0.9.1.orig/smbldap-groupmod (+5 lines)
Lines 208-213 Link Here
208
    push (@adds, 'objectClass' => 'sambaGroupMapping');
208
    push (@adds, 'objectClass' => 'sambaGroupMapping');
209
  }
209
  }
210
210
211
  if (defined $config{idmapinplace} ) {
212
    unless (grep($_ =~ /^sambaIdmapEntry$/i, @oc)) {
213
      push (@adds, 'objectClass' => 'sambaIdmapEntry');
214
    }
215
  }
211
  my $modify = $ldap_master->modify ( "cn=$groupName,$config{groupsdn}",
216
  my $modify = $ldap_master->modify ( "cn=$groupName,$config{groupsdn}",
212
				      changes => [
217
				      changes => [
213
						  'add' => [ @adds ],
218
						  'add' => [ @adds ],
(-)smbldap-tools-0.9.1.orig/smbldap-populate (-50 / +56 lines)
Lines 189-194 Link Here
189
objectClass: organizationalUnit
189
objectClass: organizationalUnit
190
ou: $ou_idmap\n";
190
ou: $ou_idmap\n";
191
}
191
}
192
my $appobjectclass="";
193
if (defined $config{idmapinplace}) {
194
		    $appobjectclass="\nobjectClass: sambaIdmapEntry";
195
} else {
196
			$appobjectclass="";
197
}
192
198
193
$entries.="\ndn: uid=$adminName,$config{usersdn}
199
$entries.="\ndn: uid=$adminName,$config{usersdn}
194
cn: $adminName
200
cn: $adminName
Lines 196-202 Link Here
196
objectClass: inetOrgPerson
202
objectClass: inetOrgPerson
197
objectClass: sambaSAMAccount
203
objectClass: sambaSAMAccount
198
objectClass: posixAccount
204
objectClass: posixAccount
199
objectClass: shadowAccount
205
objectClass: shadowAccount$appobjectclass
200
gidNumber: $adminGidNumber
206
gidNumber: $adminGidNumber
201
uid: $adminName
207
uid: $adminName
202
uidNumber: $adminUidNumber\n";
208
uidNumber: $adminUidNumber\n";
Lines 240-246 Link Here
240
objectClass: inetOrgPerson
246
objectClass: inetOrgPerson
241
objectClass: sambaSAMAccount
247
objectClass: sambaSAMAccount
242
objectClass: posixAccount
248
objectClass: posixAccount
243
objectClass: shadowAccount
249
objectClass: shadowAccount$appobjectclass
244
gidNumber: 514
250
gidNumber: 514
245
uid: $guestName
251
uid: $guestName
246
uidNumber: $guestUidNumber
252
uidNumber: $guestUidNumber
Lines 274-280 Link Here
274
280
275
dn: cn=Domain Admins,$config{groupsdn}
281
dn: cn=Domain Admins,$config{groupsdn}
276
objectClass: posixGroup
282
objectClass: posixGroup
277
objectClass: sambaGroupMapping
283
objectClass: sambaGroupMapping$appobjectclass
278
gidNumber: 512
284
gidNumber: 512
279
cn: Domain Admins
285
cn: Domain Admins
280
memberUid: $adminName
286
memberUid: $adminName
Lines 285-291 Link Here
285
291
286
dn: cn=Domain Users,$config{groupsdn}
292
dn: cn=Domain Users,$config{groupsdn}
287
objectClass: posixGroup
293
objectClass: posixGroup
288
objectClass: sambaGroupMapping
294
objectClass: sambaGroupMapping$appobjectclass
289
gidNumber: 513
295
gidNumber: 513
290
cn: Domain Users
296
cn: Domain Users
291
description: Netbios Domain Users
297
description: Netbios Domain Users
Lines 295-301 Link Here
295
301
296
dn: cn=Domain Guests,$config{groupsdn}
302
dn: cn=Domain Guests,$config{groupsdn}
297
objectClass: posixGroup
303
objectClass: posixGroup
298
objectClass: sambaGroupMapping
304
objectClass: sambaGroupMapping$appobjectclass
299
gidNumber: 514
305
gidNumber: 514
300
cn: Domain Guests
306
cn: Domain Guests
301
description: Netbios Domain Guests Users
307
description: Netbios Domain Guests Users
Lines 305-311 Link Here
305
311
306
dn: cn=Domain Computers,$config{groupsdn}
312
dn: cn=Domain Computers,$config{groupsdn}
307
objectClass: posixGroup
313
objectClass: posixGroup
308
objectClass: sambaGroupMapping
314
objectClass: sambaGroupMapping$appobjectclass
309
gidNumber: 515
315
gidNumber: 515
310
cn: Domain Computers
316
cn: Domain Computers
311
description: Netbios Domain Computers accounts
317
description: Netbios Domain Computers accounts
Lines 315-321 Link Here
315
321
316
dn: cn=Administrators,$config{groupsdn}
322
dn: cn=Administrators,$config{groupsdn}
317
objectClass: posixGroup
323
objectClass: posixGroup
318
objectClass: sambaGroupMapping
324
objectClass: sambaGroupMapping$appobjectclass
319
gidNumber: 544
325
gidNumber: 544
320
cn: Administrators
326
cn: Administrators
321
description: Netbios Domain Members can fully administer the computer/sambaDomainName
327
description: Netbios Domain Members can fully administer the computer/sambaDomainName
Lines 323-362 Link Here
323
sambaGroupType: 5
329
sambaGroupType: 5
324
displayName: Administrators
330
displayName: Administrators
325
331
326
#dn: cn=Users,$config{groupsdn}
332
dn: cn=Users,$config{groupsdn}
327
#objectClass: posixGroup
333
objectClass: posixGroup
328
#objectClass: sambaGroupMapping
334
objectClass: sambaGroupMapping$appobjectclass
329
#gidNumber: 545
335
gidNumber: 545
330
#cn: Users
336
cn: Users
331
#description: Netbios Domain Ordinary users
337
description: Netbios Domain Ordinary users
332
#sambaSID: S-1-5-32-545
338
sambaSID: S-1-5-32-545
333
#sambaGroupType: 5
339
sambaGroupType: 5
334
#displayName: users
340
displayName: users
335
341
336
#dn: cn=Guests,$config{groupsdn}
342
dn: cn=Guests,$config{groupsdn}
337
#objectClass: posixGroup
343
objectClass: posixGroup
338
#objectClass: sambaGroupMapping
344
objectClass: sambaGroupMapping$appobjectclass
339
#gidNumber: 546
345
gidNumber: 546
340
#cn: Guests
346
cn: Guests
341
#memberUid: $guestName
347
memberUid: $guestName
342
#description: Netbios Domain Users granted guest access to the computer/sambaDomainName
348
description: Netbios Domain Users granted guest access to the computer/sambaDomainName
343
#sambaSID: S-1-5-32-546
349
sambaSID: S-1-5-32-546
344
#sambaGroupType: 5
350
sambaGroupType: 5
345
#displayName: Guests
351
displayName: Guests
346
352
347
#dn: cn=Power Users,$config{groupsdn}
353
dn: cn=Power Users,$config{groupsdn}
348
#objectClass: posixGroup
354
objectClass: posixGroup
349
#objectClass: sambaGroupMapping
355
objectClass: sambaGroupMapping$appobjectclass
350
#gidNumber: 547
356
gidNumber: 547
351
#cn: Power Users
357
cn: Power Users
352
#description: Netbios Domain Members can share directories and printers
358
description: Netbios Domain Members can share directories and printers
353
#sambaSID: S-1-5-32-547
359
sambaSID: S-1-5-32-547
354
#sambaGroupType: 5
360
sambaGroupType: 5
355
#displayName: Power Users
361
displayName: Power Users
356
362
357
dn: cn=Account Operators,$config{groupsdn}
363
dn: cn=Account Operators,$config{groupsdn}
358
objectClass: posixGroup
364
objectClass: posixGroup
359
objectClass: sambaGroupMapping
365
objectClass: sambaGroupMapping$appobjectclass
360
gidNumber: 548
366
gidNumber: 548
361
cn: Account Operators
367
cn: Account Operators
362
description: Netbios Domain Users to manipulate users accounts
368
description: Netbios Domain Users to manipulate users accounts
Lines 364-382 Link Here
364
sambaGroupType: 5
370
sambaGroupType: 5
365
displayName: Account Operators
371
displayName: Account Operators
366
372
367
#dn: cn=System Operators,$config{groupsdn}
373
dn: cn=System Operators,$config{groupsdn}
368
#objectClass: posixGroup
374
objectClass: posixGroup
369
#objectClass: sambaGroupMapping
375
objectClass: sambaGroupMapping$appobjectclass
370
#gidNumber: 549
376
gidNumber: 549
371
#cn: System Operators
377
cn: System Operators
372
#description: Netbios Domain System Operators
378
description: Netbios Domain System Operators
373
#sambaSID: S-1-5-32-549
379
sambaSID: S-1-5-32-549
374
#sambaGroupType: 5
380
sambaGroupType: 5
375
#displayName: System Operators
381
displayName: System Operators
376
382
377
dn: cn=Print Operators,$config{groupsdn}
383
dn: cn=Print Operators,$config{groupsdn}
378
objectClass: posixGroup
384
objectClass: posixGroup
379
objectClass: sambaGroupMapping
385
objectClass: sambaGroupMapping$appobjectclass
380
gidNumber: 550
386
gidNumber: 550
381
cn: Print Operators
387
cn: Print Operators
382
description: Netbios Domain Print Operators
388
description: Netbios Domain Print Operators
Lines 386-392 Link Here
386
392
387
dn: cn=Backup Operators,$config{groupsdn}
393
dn: cn=Backup Operators,$config{groupsdn}
388
objectClass: posixGroup
394
objectClass: posixGroup
389
objectClass: sambaGroupMapping
395
objectClass: sambaGroupMapping$appobjectclass
390
gidNumber: 551
396
gidNumber: 551
391
cn: Backup Operators
397
cn: Backup Operators
392
description: Netbios Domain Members can bypass file security to back up files
398
description: Netbios Domain Members can bypass file security to back up files
Lines 396-402 Link Here
396
402
397
dn: cn=Replicators,$config{groupsdn}
403
dn: cn=Replicators,$config{groupsdn}
398
objectClass: posixGroup
404
objectClass: posixGroup
399
objectClass: sambaGroupMapping
405
objectClass: sambaGroupMapping$appobjectclass
400
gidNumber: 552
406
gidNumber: 552
401
cn: Replicators
407
cn: Replicators
402
description: Netbios Domain Supports file replication in a sambaDomainName
408
description: Netbios Domain Supports file replication in a sambaDomainName
(-)smbldap-tools-0.9.1.orig/smbldap-useradd (+4 lines)
Lines 396-401 Link Here
396
				      );
396
				      );
397
	
397
	
398
    $modify->code && die "failed to add entry: ", $modify->error ;
398
    $modify->code && die "failed to add entry: ", $modify->error ;
399
	if (defined $config{idmapinplace} ) {
400
		$modify = $ldap_master->modify ( "uid=$userName,$config{usersdn}",changes => [add => [objectClass => 'sambaIdmapEntry'] ] );
401
	    $modify->code && die "failed to add in-place idmap entry: ", $modify->error ;
402
	};
399
403
400
  } else {
404
  } else {
401
    my $FILE="|smbpasswd -s -a $userName >/dev/null" ;
405
    my $FILE="|smbpasswd -s -a $userName >/dev/null" ;
(-)smbldap-tools-0.9.1.orig/smbldap-usermod (+4 lines)
Lines 126-131 Link Here
126
						 ]
126
						 ]
127
				    );
127
				    );
128
  $modify->code && warn "failed to modify entry: ", $modify->error ;
128
  $modify->code && warn "failed to modify entry: ", $modify->error ;
129
  if (defined $config{idmapinplace} ) {
130
    $modify = $ldap_master->modify ( "$dn",changes => [add => [objectClass => 'sambaIdmapEntry'] ] );
131
    $modify->code && die "failed to add in-place idmap entry: ", $modify->error ;
132
  };
129
}
133
}
130
134
131
# Process options
135
# Process options

Return to bug 9225