Attachment 3374 Details for Bug 19978

[patch] add --bindpwdfile which read password from file

19978.patch (text/plain), 4.10 KB, created by Martin Müller on 2011-07-01 10:41 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Müller

Created: 2011-07-01 10:41 CEST

Size: 4.10 KB

patch

obsolete

>Index: ucs/management/univention-directory-manager-modules/debian/changelog
>===================================================================
>--- ucs/management/univention-directory-manager-modules/debian/changelog	(Revision 1839)
>+++ ucs/management/univention-directory-manager-modules/debian/changelog	(Arbeitskopie)
>@@ -1,3 +1,9 @@
>+univention-directory-manager-modules (6.0.206-2) unstable; urgency=low
>+
>+  * add --bindpwdfile option (Bug #19978)
>+
>+ -- Martin MÃ¼ller <packages@univention.de>  Thu, 23 Jun 2011 15:38:23 +0200
>+
> univention-directory-manager-modules (6.0.206-1) unstable; urgency=low
> 
>   * fix search for forward_zone->mXRecord (Bug #22659)
>Index: ucs/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
>===================================================================
>--- ucs/management/univention-directory-manager-modules/modules/univention/admincli/admin.py	(Revision 1839)
>+++ ucs/management/univention-directory-manager-modules/modules/univention/admincli/admin.py	(Arbeitskopie)
>@@ -3,7 +3,7 @@
> # Univention Admin Modules
> #  command line frontend to univention-directory-manager (module)
> #
>-# Copyright 2004-2010 Univention GmbH
>+# Copyright 2004-2011 Univention GmbH
> #
> # http://www.univention.de/
> #
>@@ -71,6 +71,7 @@
> 	out.append('create options:')
> 	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
> 	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
>+	out.append('  --%-30s %s' % ('bindpwdfile', 'bind password file'))
> 	out.append('  --%-30s %s' % ('position', 'Set position in tree'))
> 	out.append('  --%-30s %s' % ('set', 'Set variable to value, e.g. foo=bar'))
> 	out.append('  --%-30s %s' % ('superordinate', 'Use superordinate module'))
>@@ -83,6 +84,7 @@
> 	out.append('modify options:')
> 	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
> 	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
>+	out.append('  --%-30s %s' % ('bindpwdfile', 'bind password file'))
> 	out.append('  --%-30s %s' % ('dn', 'Edit object with DN'))
> 	out.append('  --%-30s %s' % ('arg', 'Edit object with ARG'))
> 	out.append('  --%-30s %s' % ('set', 'Set variable to value, e.g. foo=bar'))
>@@ -99,6 +101,7 @@
> 	out.append('remove options:')
> 	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
> 	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
>+	out.append('  --%-30s %s' % ('bindpwdfile', 'bind password file'))
> 	out.append('  --%-30s %s' % ('dn', 'Remove object with DN'))
> 	out.append('  --%-30s %s' % ('superordinate', 'Use superordinate module'))
> 	out.append('  --%-30s %s' % ('arg', 'Remove object with ARG'))
>@@ -114,6 +117,7 @@
> 	out.append('move options:')
> 	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
> 	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
>+	out.append('  --%-30s %s' % ('bindpwdfile', 'bind password file'))
> 	out.append('  --%-30s %s' % ('dn', 'Move object with DN'))
> 	out.append('  --%-30s %s' % ('position', 'Move to position in tree'))
> 	out.append('')
>@@ -386,7 +390,7 @@
> 	remove_referring=0
> 	recursive=1
> 	# parse options
>-	longopts=['position=', 'dn=', 'arg=', 'set=', 'append=', 'remove=', 'superordinate=', 'option=', 'append-option=', 'filter=', 'tls=', 'ignore_exists', 'logfile=', 'policies=', 'binddn=', 'bindpwd=', 'customattribute=', 'customattribute-remove=','policy-reference=','policy-dereference=','remove_referring','recursive']
>+	longopts=['position=', 'dn=', 'arg=', 'set=', 'append=', 'remove=', 'superordinate=', 'option=', 'append-option=', 'filter=', 'tls=', 'ignore_exists', 'logfile=', 'policies=', 'binddn=', 'bindpwd=','bindpwdfile=', 'customattribute=', 'customattribute-remove=','policy-reference=','policy-dereference=','remove_referring','recursive']
> 	try:
> 		opts, args=getopt.getopt(arglist[3:], '', longopts)
> 	except getopt.error, msg:
>@@ -430,6 +434,13 @@
> 				policyOptions=" "
> 		elif opt == '--binddn':
> 			binddn=val
>+		elif opt == '--bindpwdfile':
>+			if not os.access(val,os.R_OK):
>+				out.append('WARNING: file not found: %s' % val)
>+				return out + ["OPERATION FAILED"]
>+			bindpwd=open(val).read()
>+			if bindpwd.rstrip('\n\r'):
>+				bindpwd=bindpwd[:-1]
> 		elif opt == '--bindpwd':
> 			bindpwd=val
> 		elif opt == '--dn':

Actions: View | Diff

Attachments on bug 19978: 3374