Changeset 2022

Timestamp:

08/14/08 18:27:55 (4 months ago)

Author:

virdiq

Message:

Fix incorrect assumptions in do_rmdir that GetGroupByID and GetUserByID always return valid structs.

Files:

• trunk/libwzd-core/wzd_ClientThread.c (modified) (4 diffs)

trunk/libwzd-core/wzd_ClientThread.c

@@ -1433 +1433 @@
-int do_rmdir(UNUSED wzd_string_t *name, wzd_string_t * arg, wzd_context_t * context)
-{
-
+
+
-  fs_filestat_t s;
-  int ret;
-
+
+
-  const char *param;
-
@@ -1447 +1449 @@
-
-  user = GetUserByID(context->userid);
+  if (!user)
+    goto label_error_rmdir;
-
-  if ( !(user->userperms & RIGHT_RMDIR) ) { ret = E_NOPERM;; goto label_error_rmdir; }
@@ -1489 +1493 @@
-
-    {
-      const char *groupname=NULL;
-      char tbuf[WZD_MAX_PATH], path[WZD_MAX_PATH];
-
-      if (user->group_num > 0) {
-name = GetGroupByID(user->groups[0])->groupname
+ = GetGroupByID(user->groups[0])
-      }
-
@@ -1508 +1511 @@
-          path, /* ftp-absolute path */
-          user->username,
-(groupname)?groupname:"No G
-user->tagline
+group ? group->groupname : "No g
+*(user->tagline) ? user->tagline : "No tagline"
-          );
-    }