Blame SOURCES/authconfig-6.2.8-joinpassword.patch
|
 |
977b74 |
diff -up authconfig-6.2.8/authinfo.py.joinpassword authconfig-6.2.8/authinfo.py
|
|
|
977b74 |
--- authconfig-6.2.8/authinfo.py.joinpassword 2015-07-03 12:47:44.993864700 +0200
|
|
|
977b74 |
+++ authconfig-6.2.8/authinfo.py 2015-07-03 12:53:21.451618592 +0200
|
|
|
977b74 |
@@ -4296,11 +4296,12 @@ class AuthInfo:
|
|
|
977b74 |
|
|
|
977b74 |
if echo:
|
|
|
977b74 |
sys.stderr.write("[%s]\n" % cmd)
|
|
|
977b74 |
+ if self.joinPassword or not echo:
|
|
|
977b74 |
+ status, error = feedFork(cmd, echo, "sword:", self.joinPassword)
|
|
|
977b74 |
+ else:
|
|
|
977b74 |
child = Popen([cmd], shell=True)
|
|
|
977b74 |
child.communicate()
|
|
|
977b74 |
status = child.returncode
|
|
|
977b74 |
- else:
|
|
|
977b74 |
- status, error = feedFork(cmd, echo, "sword:", self.joinPassword)
|
|
|
977b74 |
if echo:
|
|
|
977b74 |
if status != 0:
|
|
|
977b74 |
self.messageCB(_("Winbind domain join was not successful."))
|