Merge branch 'from-hg'

2011-08-16 19:05:23 -04:00
parent 1f93618096 047f5ddb8b
commit e02e1d81ff
682 changed files with 5860 additions and 7741 deletions
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -1,6 +1,6 @@
 # Makefile for MBSE BBS under Linux
 # Copyright (c) 1998, 2001 by M. Broek.
-# $Id$
+# $Id: Makefile,v 1.12 2007/05/27 12:50:48 mbse Exp $

 include ../Makefile.global

--- a/unix/basename.h
+++ b/unix/basename.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: basename.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _BASENAME_H
 #define _BASENAME_H
--- a/unix/chowntty.c
+++ b/unix/chowntty.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: chowntty.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/chowntty.h
+++ b/unix/chowntty.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: chowntty.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _CHOWNTTY_H
 #define _CHOWNTTY_H
--- a/unix/commonio.c
+++ b/unix/commonio.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: commonio.c,v 1.3 2005/07/14 19:25:58 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/encrypt.c
+++ b/unix/encrypt.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: encrypt.c,v 1.4 2005/04/12 17:25:42 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/env.c
+++ b/unix/env.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: env.c,v 1.3 2005/08/30 17:53:35 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/env.h
+++ b/unix/env.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: env.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _ENV_H
 #define	_ENV_H
--- a/unix/getdef.c
+++ b/unix/getdef.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: getdef.c,v 1.4 2005/08/30 17:53:35 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/getdef.h
+++ b/unix/getdef.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: getdef.h,v 1.2 2002/01/11 21:07:04 mbroek Exp $ */

 #ifndef _GETDEF_H
 #define _GETDEF_H
--- a/unix/limits.c
+++ b/unix/limits.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: limits.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/limits.h
+++ b/unix/limits.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: limits.h,v 1.2 2002/01/06 13:24:24 mbroek Exp $ */

 #ifndef	_LIMITS_H_H
 #define	_LIMITS_H_H
--- a/unix/log.c
+++ b/unix/log.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: log.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/log.h
+++ b/unix/log.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef	_LOG_LOG_H
 #define	_LOG_LOG_H
--- a/unix/login.defs.in
+++ b/unix/login.defs.in
@@ -1,7 +1,7 @@
 #
 # $MBSE_ROOT/etc/login.defs - Configuration control definitions for mblogin.
 #
-#   $Id$
+#   $Id: login.defs.in,v 1.3 2004/11/28 18:23:13 mbse Exp $

 # Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
 # If unspecified, some arbitrary (and possibly incorrect) value will
--- a/unix/loginprompt.c
+++ b/unix/loginprompt.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: loginprompt.c,v 1.3 2005/08/30 17:53:35 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/loginprompt.h
+++ b/unix/loginprompt.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: loginprompt.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef	_LOGINPROMPT_H
 #define	_LOGINPROMPT_H
--- a/unix/mblogin.c
+++ b/unix/mblogin.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: mblogin.c,v 1.9 2007/08/26 15:05:33 mbse Exp $
 * Purpose ...............: Login program for MBSE BBS.
 * Shadow Suite (c) ......: Julianne Frances Haugh
 *
@@ -448,34 +448,12 @@ int main(int argc, char **argv)
    STRFCPY(tty, utent.ut_line);

    if (hflg) {
-#ifdef UT_ADDR
-	struct hostent *he;
-
-        /*
-         * Fill in the ut_addr field (remote login IP address).
-         * XXX - login from util-linux does it, but this is not
-         * the right place to do it.  The program that starts
-         * login (telnetd, rlogind) knows the IP address, so it
-         * should create the utmp entry and fill in ut_addr.
-         * gethostbyname() is not 100% reliable (the remote host
-         * may be unknown, etc.).  --marekm
-         */
-
-        if ((he = gethostbyname(hostname))) {
-	    utent.ut_addr = *((int32_t *)(he->h_addr_list[0]));
-#endif
-#ifdef UT_HOST
-	    strncpy(utent.ut_host, hostname, sizeof(utent.ut_host));
-#endif
-#if HAVE_UTMPX_H
-	    strncpy(utxent.ut_host, hostname, sizeof(utxent.ut_host));
-#endif
-	    /*
-	     * Add remote hostname to the environment.  I think
-	     * (not sure) I saw it once on Irix.  --marekm
-	     */
-	    addenv("REMOTEHOST", hostname);
-	}
+	/*
+	 * Add remote hostname to the environment.  I think
+	 * (not sure) I saw it once on Irix.  --marekm
+	 */
+	addenv("REMOTEHOST", hostname);
+    }

 #ifdef __linux__ 
 	/* workaround for init/getty leaving junk in ut_host at least in some
--- a/unix/mblogin.h
+++ b/unix/mblogin.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mblogin.h,v 1.3 2003/12/23 18:33:42 mbroek Exp $ */

 #ifndef	_MBLOGIN_H
 #define	_MBLOGIN_H
--- a/unix/mbpasswd.c
+++ b/unix/mbpasswd.c
@@ -1,11 +1,10 @@
 /*****************************************************************************
 *
- * $Id$
 * Purpose ...............: setuid root version of passwd
 * Shadow Suite (c) ......: Julianne Frances Haugh
 *
 *****************************************************************************
- * Copyright (C) 1997-2007
+ * Copyright (C) 1997-2011
 *   
 * Michiel Broek	FIDO:		2:280/2802
 * Beekmansbos 10
@@ -847,7 +846,6 @@ int main(int argc, char *argv[])
    static struct group	    *gr;
    int			    pfd, tfd;
 #endif
-    char		    *cp;
 #ifdef _VPOPMAIL_PATH
    char		    *args[16];
 #endif
@@ -1057,11 +1055,8 @@ int main(int argc, char *argv[])
    sp = getspnam(name);
    if (!sp)
 	sp = pwd_to_spwd(pw);
-
-    cp = sp->sp_pwdp;
-#else
-    cp = pw->pw_passwd;
 #endif
+
    /*
     * See if the user is permitted to change the password.
     * Otherwise, go ahead and set a new password.
--- a/unix/mbpasswd.h
+++ b/unix/mbpasswd.h
@@ -1,7 +1,7 @@
 #ifndef _MBPASSWD_H
 #define _MBPASSWD_H

-/* $Id$ */
+/* $Id: mbpasswd.h,v 1.4 2005/08/27 12:06:49 mbse Exp $ */


                                        /* danger - side effects */
--- a/unix/mbuseradd.c
+++ b/unix/mbuseradd.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: mbuseradd.c,v 1.24 2007/05/28 10:40:24 mbse Exp $
 * Purpose ...............: setuid root version of useradd
 *
 *****************************************************************************
--- a/unix/pw_util.c
+++ b/unix/pw_util.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: pw_util.c,v 1.11 2004/12/28 15:30:53 mbse Exp $
 * Purpose ...............: FreeBSD/NetBSD password utilities.
 * Remark ................: Taken from FreeBSD and modified for MBSE BBS.
 *
--- a/unix/pw_util.h
+++ b/unix/pw_util.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: pw_util.h,v 1.3 2004/12/28 15:30:53 mbse Exp $
 *
 * Copyright (c) 1994
 *	The Regents of the University of California.  All rights reserved.
--- a/unix/pwauth.c
+++ b/unix/pwauth.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: pwauth.c,v 1.4 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/pwauth.h
+++ b/unix/pwauth.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pwauth.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _PWAUTH_H
 #define	_PWAUTH_H
--- a/unix/pwdcheck.c
+++ b/unix/pwdcheck.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: pwdcheck.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyrioght ...: Julianne Frances Haugh and others.
--- a/unix/pwdcheck.h
+++ b/unix/pwdcheck.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pwdcheck.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _PWDCHECK_H
 #define _PWDCHECK_H
--- a/unix/pwio.c
+++ b/unix/pwio.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: pwio.c,v 1.5 2004/12/28 15:30:53 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/pwio.h
+++ b/unix/pwio.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pwio.h,v 1.3 2004/12/28 15:30:53 mbse Exp $ */

 #ifndef	_PWIO_H
 #define	_PWIO_H
--- a/unix/salt.c
+++ b/unix/salt.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: salt.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyrioght ...: Julianne Frances Haugh and others.
--- a/unix/setugid.c
+++ b/unix/setugid.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: setugid.c,v 1.3 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/setugid.h
+++ b/unix/setugid.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: setugid.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _SETUGID_H
 #define	_SETUGID_H
--- a/unix/setupenv.c
+++ b/unix/setupenv.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: setupenv.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/setupenv.h
+++ b/unix/setupenv.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: setupenv.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef	_SETUPENV_H
 #define	_SETUPENV_H
--- a/unix/shell.c
+++ b/unix/shell.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: shell.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/shell.h
+++ b/unix/shell.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: shell.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _SHELL_H
 #define _SHELL_H
--- a/unix/sub.c
+++ b/unix/sub.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: sub.c,v 1.2 2003/08/15 20:05:36 mbroek Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/sub.h
+++ b/unix/sub.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sub.h,v 1.1 2002/01/05 13:57:10 mbroek Exp $ */

 #ifndef _SUB_H
 #define	_SUB_H
--- a/unix/utmp.c
+++ b/unix/utmp.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: utmp.c,v 1.7 2004/12/28 15:30:53 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyright ....: Julianne Frances Haugh and others.
--- a/unix/utmp.h
+++ b/unix/utmp.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: utmp.h,v 1.4 2004/12/28 15:30:53 mbse Exp $ */

 #ifndef	_UTMP_HH
 #define	_UTMP_HH
--- a/unix/xmalloc.c
+++ b/unix/xmalloc.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
- * $Id$
+ * $Id: xmalloc.c,v 1.3 2005/08/27 12:06:49 mbse Exp $
 * Purpose ...............: MBSE BBS Shadow Password Suite
 * Original Source .......: Shadow Password Suite
 * Original Copyrioght ...: Julianne Frances Haugh and others.
--- a/unix/xmalloc.h
+++ b/unix/xmalloc.h
@@ -1,7 +1,7 @@
 #ifndef	_XMALLOC_H
 #define	_XMALLOC_H

-/* $Id$ */
+/* $Id: xmalloc.h,v 1.2 2005/08/27 12:06:49 mbse Exp $ */

 char *xmalloc(size_t);
 char *xstrdup(const char *);