Attachment 245164 Details for Bug 431685

[patch] patch for yast2-users

u.diff (text/plain), 4.15 KB, created by Jiří Suchomel on 2008-10-13 14:05:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2008-10-13 14:05:44 UTC

Size: 4.15 KB

patch

obsolete

>Index: cmdline.ycp
>===================================================================
>--- cmdline.ycp	(revision 51721)
>+++ cmdline.ycp	(working copy)
>@@ -26,13 +26,14 @@
> /**
>  * set LDAP admin password and read LDAP users and groups
>  */
>-define boolean bind_and_read_LDAP (string pw) {
>+define boolean bind_and_read_LDAP (map<string,any> options) {
> 
>+    string pw	= options["ldap_password"]:"";
>     if (Users::LDAPAvailable() && Users::LDAPNotRead())
>     {
> 	if (Ldap::bind_pass == nil)
> 	{
>-	    if (pw == "")
>+	    if (pw == "" && !haskey (options, "batchmode"))
> 	    {
> 		// password entering label
> 		pw = CommandLine::PasswordInput (_("LDAP Server Password:"));
>@@ -253,7 +254,7 @@
>     string type = user["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
> 	if (!haskey (user,"sn"))
> 	    user["sn"] = user["uid"]:"";
>@@ -261,7 +262,7 @@
> 
>     Users::ResetCurrentUser ();
> 
>-    if (!haskey(user,"userPassword"))
>+    if (!haskey(user,"userPassword") && !haskey (user, "batchmode"))
>     {
> 	string pw	= "";
> 	integer i	= 0;
>@@ -335,7 +336,7 @@
>     string type = options["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
>     }
>     if (uid != -1 && uid != nil)
>@@ -382,7 +383,7 @@
>     string type = options["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
>     }
>     if (uid != -1 && uid != nil)
>@@ -554,7 +555,7 @@
>     string type = options["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
>     }
>     if (gid != -1 && gid != nil)
>@@ -591,7 +592,7 @@
>     string type = group["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
>     }
>     string member_attr	= (type == "ldap") ? UsersLDAP::GetMemberAttribute () :
>@@ -644,7 +645,7 @@
>     string type = options["type"]:"local";
>     if (type == "ldap")
>     {
>-	if (!bind_and_read_LDAP (options["ldap_password"]:""))
>+	if (!bind_and_read_LDAP (options))
> 	    return false;
>     }
>     if (gid != -1 && gid != nil)
>Index: users.ycp
>===================================================================
>--- users.ycp	(revision 51721)
>+++ users.ycp	(working copy)
>@@ -194,13 +194,25 @@
> 	    "help"	: _("New UID of the user"),
> 	    "type"	: "string"
> 	],
>+	"batchmode"	:$[
>+	    // translators: command line help text for batchmode option
>+	    "help"	: _("Don't ask for missing data; return error instead.")
>+	],
>     ],
>     "mappings"		: $[
> 	"list"	: [ "local", "system", "ldap", "nis", ],// + "custom"
> 	"show"  : [ "uid", "username", "type" ],
>-	"add"	: [ "username", "uid", "cn", "password", "home", "no_home", "shell", "gid", "grouplist", "type", "ldap_password" ],
>-	"edit"	: [ "username", "uid", "cn", "password", "home", "shell", "gid", "grouplist", "new_username", "new_uid", "type", "ldap_password" ],
>-	"delete": [ "username", "uid", "delete_home", "type", "ldap_password" ],
>+	"add"	: [ "username", "uid", "cn", "password", "home", "no_home",
>+		    "shell", "gid", "grouplist", "type", "ldap_password",
>+		    "batchmode"
>+	],
>+	"edit"	: [ "username", "uid", "cn", "password", "home", "shell", "gid",
>+		    "grouplist", "new_username", "new_uid", "type",
>+		    "ldap_password", "batchmode"
>+	],
>+	"delete": [ "username", "uid", "delete_home", "type", "ldap_password",
>+		    "batchmode"
>+	],
>     ]
> ];
> 
>Index: groups.ycp
>===================================================================
>--- groups.ycp	(revision 51721)
>+++ groups.ycp	(working copy)
>@@ -172,6 +172,10 @@
> 	    "help"	: _("Password for LDAP server"),
> 	    "type"	: "string"
> 	],
>+	"batchmode"	:$[
>+	    // translators: command line help text for batchmode option
>+	    "help"	: _("Don't ask for missing data; return error instead.")
>+	],
>     ],
>     "mappings"		: $[
> 	"list"	: [ "local", "system", "ldap", "nis" ],// + "custom"

Actions: View | Diff

Attachments on bug 431685: 245164