X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-groupadd;h=de074b952a8ac6be3afce75ce0bc176db023e4f0;hb=198bda079d03f7251b50f95e6a28c1fb046e616a;hp=6139556470c83414eb0b58bee00e065b59262f1d;hpb=132e97a3d7ec059eba5a39360a2bf0e6432051f8;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-groupadd b/ud-groupadd
index 6139556..de074b9 100755
--- a/ud-groupadd
+++ b/ud-groupadd
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 
-#   Copyright (c) 2000  Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2000       Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2001-2003  James Troup <troup@debian.org>
+#   Copyright (c) 2004       Joey Schulze <joey@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import string, re, time, ldap, getopt, sys, os, pwd;
+import re, time, ldap, getopt, sys, os, pwd;
 from userdir_ldap import *;
 from userdir_gpg import *;
 
@@ -52,13 +53,7 @@ for (switch, val) in options:
    if (switch == '-u'):
       AdminUser = val;
 
-print "Accessing LDAP directory as '" + AdminUser + "'";
-Password = getpass(AdminUser + "'s password: ");
-
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
 
 while 1:
    Group = raw_input("Group name? ");
@@ -79,4 +74,4 @@ print "Updating LDAP directory..",
 sys.stdout.flush();
 l.add_s(Dn,[("gid",Group),
             ("gidNumber",str(Id)),
-            ("objectClass",("top", "debianGroup"))]);
+            ("objectClass", GroupObjectClasses)])