Update Copyright notices for 2013

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index a4c2fe8aabc07c72ff5fa00b21330ea087612856..dfae3366d1f72655cc8cc0e51088b369d9218114 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -351,6 +351,13 @@ Fill_Version(void)
 {
        NGIRCd_VersionAddition[0] = '\0';
 
+#ifdef ICONV
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "CHARCONV",
+               sizeof NGIRCd_VersionAddition);
+#endif
 #ifdef DEBUG
        if (NGIRCd_VersionAddition[0])
                strlcat(NGIRCd_VersionAddition, "+",
@@ -453,7 +460,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2012 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2013 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\n" );
        puts( "This is free software; see the source for copying conditions. There is NO" );
        puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
@@ -560,6 +567,8 @@ Setup_FDStreams(int fd)
 } /* Setup_FDStreams */
 
 
+#if !defined(SINGLE_USER_OS)
+
 /**
  * Get user and group ID of unprivileged "nobody" user.
  *
@@ -599,6 +608,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
        return true;
 } /* NGIRCd_getNobodyID */
 
+#endif
+
 
 static bool
 Random_Init_Kern(const char *file)
@@ -685,6 +696,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                }
        }
 
+#if !defined(SINGLE_USER_OS)
        /* Check user ID */
        if (Conf_UID == 0) {
                pwd = getpwuid(0);
@@ -711,6 +723,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                                goto out;
                }
        }
+#endif
 
        /* Change user ID */
        if (getuid() != Conf_UID) {