BSD 4_4_Lite2 release

[unix-history] / usr / src / sbin / init / init.c

diff --git a/usr/src/sbin/init/init.c b/usr/src/sbin/init/init.c
index a3d1e66..316aa93 100644 (file)
--- a/usr/src/sbin/init/init.c
+++ b/usr/src/sbin/init/init.c
@@ -1,21 +1,47 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Donn Seeley at Berkeley Software Design, Inc.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Donn Seeley at Berkeley Software Design, Inc.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1991 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1991, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)init.c     8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)init.c     8.2 (Berkeley) 4/28/95";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -169,6 +195,13 @@ main(argc, argv)
        if (setsid() < 0)
                warning("initial setsid() failed: %m");
 
        if (setsid() < 0)
                warning("initial setsid() failed: %m");
 

+       /*
+        * Establish an initial user so that programs running
+        * single user do not freak out and die (like passwd).
+        */
+       if (setlogin("root") < 0)
+               warning("setlogin() failed: %m");
+

        /*
         * This code assumes that we always get arguments through flags,
         * never through bits set in some random machine register.
        /*
         * This code assumes that we always get arguments through flags,
         * never through bits set in some random machine register.


@@ -534,33 +567,6 @@ single_user()
                 */
                setctty(_PATH_CONSOLE);
 
                 */
                setctty(_PATH_CONSOLE);
 

-#ifdef KTRACEHACK
-               {
-                       static int tracing = 0;
-                       int foo, pid;
-
-                       if (tracing) goto skip;
-                       foo = open("/traceinit", O_RDONLY, 0);
-                       if (foo != -1) {
-                               close(foo);
-                               if ((pid = fork()) == 0) {
-                                       execl("/sbin/mount", "mount", "-uw",
-                                                "/", 0);
-                                       _exit(-1);
-                               }
-                               waitpid(pid, 0, 0);
-                               if (fork() == 0) {
-                                       execl("/ktrace", "ktrace", "-aip",
-                                                "1", 0);
-                                       _exit(-1);
-                               }
-                               waitpid(pid, 0, 0);
-                               tracing = 1;
-                       }
-                       skip: ;
-               }
-#endif /* KTRACEHACK */
-                               

 #ifdef SECURE
                /*
                 * Check the root password.
 #ifdef SECURE
                /*
                 * Check the root password.


@@ -576,7 +582,7 @@ single_user()
                                if (clear == 0 || *clear == '\0')
                                        _exit(0);
                                password = crypt(clear, pp->pw_passwd);
                                if (clear == 0 || *clear == '\0')
                                        _exit(0);
                                password = crypt(clear, pp->pw_passwd);

-                               bzero(clear, _PASSWORD_LEN);
+                               memset(clear, 0, _PASSWORD_LEN);

                                if (strcmp(password, pp->pw_passwd) == 0)
                                        break;
                                warning("single-user login failed\n");
                                if (strcmp(password, pp->pw_passwd) == 0)
                                        break;
                                warning("single-user login failed\n");


@@ -833,7 +839,7 @@ find_session(pid)
        key.size = sizeof pid;
        if ((*session_db->get)(session_db, &key, &data, 0) != 0)
                return 0;
        key.size = sizeof pid;
        if ((*session_db->get)(session_db, &key, &data, 0) != 0)
                return 0;

-       bcopy(data.data, (char *)&ret, sizeof(ret));
+       memmove(&ret, data.data, sizeof(ret));

        return ret;
 }
 
        return ret;
 }
 


@@ -892,7 +898,7 @@ new_session(sprev, session_index, typ)
                return 0;
 
        sp = (session_t *) malloc(sizeof (session_t));
                return 0;
 
        sp = (session_t *) malloc(sizeof (session_t));

-       bzero(sp, sizeof *sp);
+       memset(sp, 0, sizeof *sp);

 
        sp->se_index = session_index;
 
 
        sp->se_index = session_index;