[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-20 9:05:09
Message-ID: 20050220090509.76FC51C283 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

don't make the auto-login user a no-password user as well. there are
situations where this is undesirable (like protected boot).


  M +8 -1      client.c   2.86
  M +4 -0      dm.h   1.104
  M +5 -1      session.c   1.118


--- kdebase/kdm/backend/client.c  #2.85:2.86
@@ -95,4 +95,5 @@ char **systemEnviron;
 static int curuid;
 static int curgid;
+int cursource;
 
 char *dmrcuser;
@@ -384,6 +385,12 @@ AccNoPass( const char *un, struct passwd
                 return 0;
 
+        switch (cursource) {
+        case PWSRC_RELOGIN:
+                return 1;
+        case PWSRC_AUTOLOGIN:
         if (!strcmp( un, td->autoUser ))
                 return 1;
+                return 0;
+        }
 
         for (hg = 0, fp = td->noPassUsers; *fp; fp++)

--- kdebase/kdm/backend/dm.h  #1.103:1.104
@@ -483,4 +483,8 @@ extern char **userEnviron, **systemEnvir
 extern char *curuser, *curpass, *curtype, *newpass,
             *dmrcuser, *curdmrc, *newdmrc;
+extern int cursource;
+#define PWSRC_MANUAL 0
+#define PWSRC_AUTOLOGIN 1
+#define PWSRC_RELOGIN 2
 
 /* server.c */

--- kdebase/kdm/backend/session.c  #1.117:1.118
@@ -137,4 +137,5 @@ AutoLogon()
                 newdmrc = td->hstent->nargs;
                 td->hstent->nargs = 0;
+                cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
         } else if (*td->autoUser && tdiff > 0) {
                 unsigned int lmask;
@@ -148,6 +149,9 @@ AutoLogon()
                 StrDup( &curuser, td->autoUser );
                 StrDup( &curpass, td->autoPass );
-        } else
+                cursource = PWSRC_AUTOLOGIN;
+        } else {
+                cursource = PWSRC_MANUAL;
                 return 0;
+        }
         return 1;
 }


[prev in list] [next in list] [prev in thread] [next in thread]