ud-mailgate: remove exception for münchen.debian.net

[mirror/userdir-ldap.git] / ud-groupadd

diff --git a/ud-groupadd b/ud-groupadd
index 6139556..d41bfc3 100755 (executable)
--- a/ud-groupadd
+++ b/ud-groupadd
@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 
 #!/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) 2001-2003  James Troup <troup@debian.org>

+#   Copyright (c) 2004       Joey Schulze <joey@debian.org>
+#   Copyright (c) 2008       Peter Palfrader <peter@palfrader.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
 #
 #   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 +20,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #   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 *;
 
 from userdir_ldap import *;
 from userdir_gpg import *;
 


@@ -52,13 +54,7 @@ for (switch, val) in options:
    if (switch == '-u'):
       AdminUser = val;
 
    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(BaseDn, AdminUser)

 
 while 1:
    Group = raw_input("Group name? ");
 
 while 1:
    Group = raw_input("Group name? ");


@@ -79,4 +75,4 @@ print "Updating LDAP directory..",
 sys.stdout.flush();
 l.add_s(Dn,[("gid",Group),
             ("gidNumber",str(Id)),
 sys.stdout.flush();
 l.add_s(Dn,[("gid",Group),
             ("gidNumber",str(Id)),

-            ("objectClass",("top", "debianGroup"))]);
+            ("objectClass", GroupObjectClasses)])