@@ -68,8 +68,8 @@

 /* Define to 1 if you have the `crypto' library (-lcrypto). */

 #undef HAVE_LIBCRYPTO

-/* Define to 1 if you have the `nls' library (-lnls). */

-#undef HAVE_LIBNLS

+/* Define to 1 if you have the `nsl' library (-lnsl). */

+#undef HAVE_LIBNSL

 /* Define to 1 if you have the `socket' library (-lsocket). */

 #undef HAVE_LIBSOCKET

@@ -3540,13 +3540,13 @@ _ACEOF

 fi

-{ echo "$as_me:$LINENO: checking for inet_addr in -lnls" >&5

-echo $ECHO_N "checking for inet_addr in -lnls... $ECHO_C" >&6; }

-if test "${ac_cv_lib_nls_inet_addr+set}" = set; then

+{ echo "$as_me:$LINENO: checking for inet_addr in -lnsl" >&5

+echo $ECHO_N "checking for inet_addr in -lnsl... $ECHO_C" >&6; }

+if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

   ac_check_lib_save_LIBS=$LIBS

-LIBS="-lnls  $LIBS"

+LIBS="-lnsl  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -3587,26 +3587,26 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

 	 test ! -s conftest.err

        } && test -s conftest$ac_exeext &&

        $as_test_x conftest$ac_exeext; then

-  ac_cv_lib_nls_inet_addr=yes

+  ac_cv_lib_nsl_inet_addr=yes

 else

   echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

-	ac_cv_lib_nls_inet_addr=no

+	ac_cv_lib_nsl_inet_addr=no

 fi

 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nls_inet_addr" >&5

-echo "${ECHO_T}$ac_cv_lib_nls_inet_addr" >&6; }

-if test $ac_cv_lib_nls_inet_addr = yes; then

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_addr" >&5

+echo "${ECHO_T}$ac_cv_lib_nsl_inet_addr" >&6; }

+if test $ac_cv_lib_nsl_inet_addr = yes; then

   cat >>confdefs.h <<_ACEOF

-#define HAVE_LIBNLS 1

+#define HAVE_LIBNSL 1

 _ACEOF

-  LIBS="-lnls $LIBS"

+  LIBS="-lnsl $LIBS"

 fi

@@ -19,7 +19,7 @@ AC_PROG_INSTALL

 # Checks for libraries.

 AC_CHECK_LIB(crypto, MD5_Init)

 AC_CHECK_LIB(socket, socket)

-AC_CHECK_LIB(nls, inet_addr)

+AC_CHECK_LIB(nsl, inet_addr)

 # Checks for header files.

 AC_HEADER_DIRENT

@@ -385,7 +385,7 @@ int mexec_send(mcomm *c, int n, int sync)

   optind   = 1;

   optreset = 1;

 #else

-  optind = 0;

+  optind   = 1;

 #endif

   while((i=getopt(c->argc[n], argv, "g:t:nr")) != -1){

     switch(i){

@@ -508,15 +508,12 @@ static void minit_chdir()

 static void minit_chroot()

 {

-  time_t ttime;

-  struct tm *t;

   char tz[256];

   if(moption.chroot){

-    time(&ttime);

     tzset();

-    t = localtime(&ttime);

-    sprintf(tz, "%s%+ld",   t->tm_zone, -(t->tm_gmtoff/3600));

+    sprintf(tz, "%s%+ld", tzname[0], timezone/3600);

     setenv("TZ", tz, 0);

+    tzset();

     if(chroot(moption.base_dir) == -1){

       fprintf(stderr, "%s: can't chroot %s\n", __func__, moption.base_dir);

       exit(1);