[Cvs-cvs] Changes to ccvs/src/commit.c [cvs1-11-x-branch]

[Larry Jones]

Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.187.4.30 ccvs/src/commit.c:1.187.4.31
--- ccvs/src/commit.c:1.187.4.30        Thu Mar 17 16:31:47 2005
+++ ccvs/src/commit.c   Fri Sep  2 19:37:33 2005
@@ -388,12 +388,8 @@
     /* FIXME: Shouldn't this check be much more closely related to the
        readonly user stuff (CVSROOT/readers, &c).  That is, why should
        root be able to "cvs init", "cvs import", &c, but not "cvs ci"?  */
-    if (geteuid () == (uid_t) 0
-#  ifdef CLIENT_SUPPORT
-       /* Who we are on the client side doesn't affect logging.  */
-       && !current_parsed_root->isremote
-#  endif
-       )
+    /* Who we are on the client side doesn't affect logging.  */
+    if (geteuid () == (uid_t) 0 && !current_parsed_root->isremote)
     {
        struct passwd *pw;
 
@@ -717,10 +713,8 @@
     Lock_Cleanup ();
     dellist (&mulist);
 
-#ifdef SERVER_SUPPORT
     if (server_active)
        return err;
-#endif
 
     /* see if we need to sleep before returning to avoid time-stamp races */
     if (last_register_time)
@@ -1289,11 +1283,7 @@
     if (!got_message)
     {
        got_message = 1;
-       if (
-#ifdef SERVER_SUPPORT
-           !server_active &&
-#endif
-           use_editor)
+       if (!server_active && use_editor)
            do_editor (finfo->update_dir, &saved_message,
                       finfo->repository, ulist);
        do_verify (&saved_message, finfo->repository);
@@ -1571,11 +1561,7 @@
     /* get commit message */
     real_repos = Name_Repository (dir, update_dir);
     got_message = 1;
-    if (
-#ifdef SERVER_SUPPORT
-        !server_active &&
-#endif
-        use_editor)
+    if (!server_active && use_editor)
        do_editor (update_dir, &saved_message, real_repos, ulist);
     do_verify (&saved_message, real_repos);
     free (real_repos);