2006-06-09 02:29:26 +02:00
|
|
|
--- dropbear.old/svr-authpubkey.c.orig 2006-06-03 14:54:43.000000000 +0000
|
|
|
|
+++ dropbear.dev/svr-authpubkey.c 2006-06-03 15:03:19.000000000 +0000
|
|
|
|
@@ -176,6 +176,8 @@
|
2005-12-13 20:15:43 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-06-09 02:29:26 +02:00
|
|
|
+ if (ses.authstate.pw->pw_uid != 0) {
|
|
|
|
+
|
|
|
|
/* we don't need to check pw and pw_dir for validity, since
|
|
|
|
* its been done in checkpubkeyperms. */
|
|
|
|
len = strlen(ses.authstate.pw->pw_dir);
|
|
|
|
@@ -187,6 +189,9 @@
|
|
|
|
|
2005-12-13 20:15:43 +01:00
|
|
|
/* open the file */
|
2006-06-09 02:29:26 +02:00
|
|
|
authfile = fopen(filename, "r");
|
|
|
|
+ } else {
|
|
|
|
+ authfile = fopen("/etc/dropbear/authorized_keys","r");
|
|
|
|
+ }
|
2005-12-13 20:15:43 +01:00
|
|
|
if (authfile == NULL) {
|
|
|
|
goto out;
|
|
|
|
}
|
2006-06-09 02:29:26 +02:00
|
|
|
@@ -274,6 +279,8 @@
|
2005-12-13 20:15:43 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-06-09 02:29:26 +02:00
|
|
|
+ if (ses.authstate.pw->pw_uid != 0) {
|
|
|
|
+
|
|
|
|
/* allocate max required pathname storage,
|
|
|
|
* = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
|
|
|
|
filename = m_malloc(len + 22);
|
|
|
|
@@ -295,6 +302,14 @@
|
|
|
|
if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
|
2005-12-13 20:15:43 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2006-06-09 02:29:26 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (checkfileperm("/etc/dropbear") != DROPBEAR_SUCCESS) {
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) {
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
/* file looks ok, return success */
|
2005-12-13 20:15:43 +01:00
|
|
|
ret = DROPBEAR_SUCCESS;
|