[src/trunk]: src/external/gpl2/xcvs/dist/src It's expected that config will b...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c3523659774
branches:  trunk
changeset: 747199:1c3523659774
user:      apb <apb%NetBSD.org@localhost>
date:      Sat Sep 05 12:50:33 2009 +0000

description:
It's expected that config will be NULL in a cvs client, but not
in a server or with a local CVSROOT.

diffstat:

 external/gpl2/xcvs/dist/src/admin.c |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 6fe73201a174 -r 1c3523659774 external/gpl2/xcvs/dist/src/admin.c
--- a/external/gpl2/xcvs/dist/src/admin.c       Sat Sep 05 12:46:55 2009 +0000
+++ b/external/gpl2/xcvs/dist/src/admin.c       Sat Sep 05 12:50:33 2009 +0000
@@ -327,8 +327,17 @@
     while ((c = getopt (argc, argv,
                        "+ib::c:a:A:e::l::u::LUn:N:m:o:s:t::IqxV:k:")) != -1)
     {
-       if (c != 'q' && !strchr (config->UserAdminOptions, c))
+       if (config != NULL) {
+           if (c != 'q' && !strchr (config->UserAdminOptions, c))
+               only_allowed_options = false;
+       } else {
+#ifdef CLIENT_SUPPORT
+           assert(current_parsed_root->isremote);
            only_allowed_options = false;
+#else
+           assert(0); /* config should not be NULL, except in a client */
+#endif
+       }
 
        switch (c)
        {