login: support crazy shadow-utils syntax in login.defs

standard syntax for FOO=data:

	ENV_FOO   data

additional syntax:

	ENV_FOO  FOO=data

Reported-by: Colin Guthrie colin@mageia.org
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/login-utils/login.c b/login-utils/login.c
index 84d8b1bdbc88c857d34fdc23074196965566fee3..bc0eaec26d08fce3533918220a2c194529369890 100644 (file)
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -1145,13 +1145,10 @@ static void init_environ(struct login_context *cxt)
        setenv("TERM", termenv, 1);
 
        if (pwd->pw_uid)
-               setenv("PATH", getlogindefs_str("ENV_PATH", _PATH_DEFPATH), 1);
-       else {
-               const char *x = getlogindefs_str("ENV_ROOTPATH", NULL);
-               if (!x)
-                       x = getlogindefs_str("ENV_SUPATH", _PATH_DEFPATH_ROOT);
-               setenv("PATH", x, 1);
-       }
+               logindefs_setenv("PATH", "ENV_PATH", _PATH_DEFPATH);
+
+       else if (logindefs_setenv("PATH", "ENV_ROOTPATH", NULL) != 0)
+               logindefs_setenv("PATH", "ENV_SUPATH", _PATH_DEFPATH_ROOT);
 
        /* mailx will give a funny error msg if you forget this one */
        len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name);

diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c
index fe590e990df85e51efe0746823a61a54c2e88d16..e9517acaccaac0d51c8f61f51ccc196999b4e3cf 100644 (file)
--- a/login-utils/logindefs.c
+++ b/login-utils/logindefs.c
@@ -211,6 +211,43 @@ const char *getlogindefs_str(const char *name, const char *dflt)
        return ptr->value;
 }
 
+/*
+ * For compatibililty with shadow-utils we have tu support additional
+ * syntax for environment variables in login.defs(5) file. The standard
+ * syntax is:
+ *
+ *     ENV_FOO   data
+ *
+ * but shadow-utils supports also
+ *
+ *     ENV_FOO FOO=data
+ *
+ * the FOO= prefix has to be remove before we call setenv().
+ */
+int logindefs_setenv(const char *name, const char *conf, const char *dflt)
+{
+       const char *val = getlogindefs_str(conf, dflt);
+       const char *p;
+
+       if (!val)
+               return -1;
+
+       p = strchr(val, '=');
+       if (p) {
+               size_t sz = strlen(name);
+
+               if (strncmp(val, name, sz) == 0 && *(p + 1)) {
+                       val = p + 1;
+                       if (*val == '"')
+                               val++;
+                       if (!*val)
+                               val = dflt;
+               }
+       }
+
+       return val ? setenv(name, val, 1) : -1;
+}
+
 #ifdef TEST_PROGRAM
 int main(int argc, char *argv[])
 {

diff --git a/login-utils/logindefs.h b/login-utils/logindefs.h
index 37d19e1f72096e460d88be4dde04be5f6c329066..163869dfdc00ff67e648af0622cd26eb76e64ad3 100644 (file)
--- a/login-utils/logindefs.h
+++ b/login-utils/logindefs.h
@@ -5,5 +5,6 @@ extern int getlogindefs_bool(const char *name, int dflt);
 extern long getlogindefs_num(const char *name, long dflt);
 extern const char *getlogindefs_str(const char *name, const char *dflt);
 extern void free_getlogindefs_data(void);
+extern int logindefs_setenv(const char *name, const char *conf, const char *dflt);
 
 #endif /* UTIL_LINUX_LOGINDEFS_H */