Removed nu. Use macusers instead

diff --git a/NEWS b/NEWS
index 25671df7ffbb9307bd83f8933ab43255bc6a9dde..37cf2e69c610396ff0a39b782e802a715ca9ba6f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -40,7 +40,8 @@ Changes in 2.1-beta1
        find the right one.
        Note: now a misconfigured or plugged router can broadcast a wrong route !
 * REM: cnid_maint: use dbd [FIXME: s/dbd/INSERT NAME HERE/]
- *REM: cleanappledouble.pl: use dbd [FIXME: s/dbd/INSERT NAME HERE/]
+* REM: cleanappledouble.pl: use dbd [FIXME: s/dbd/INSERT NAME HERE/]
+* REM: nu: use `macusers` instead
 
 Changes in 2.0.5
 ================

diff --git a/configure.in b/configure.in
index 825e763663652341c893962d9d1b1852626e1dd5..0645aa88daf0bd710f5a303a9a1a08ac767a9686 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.233 2009-11-27 21:15:48 franklahm Exp $
+dnl $Id: configure.in,v 1.234 2009-12-18 13:01:15 franklahm Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -1210,8 +1210,6 @@ AC_OUTPUT([Makefile
        contrib/Makefile
        contrib/macusers/Makefile
        contrib/macusers/macusers
-       contrib/nu/Makefile
-       contrib/nu/nu
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
        contrib/shell_utils/afpd-mtab.pl

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 633257c3df66f778a1cfc7ea6a554ace9a27ab45..ae0ea4f003f6226870b7cda5e8766b5fbaaad15e 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -12,6 +12,6 @@ else
 A2BOOT =
 endif
 
-SUBDIRS = macusers nu printing shell_utils ${TIMELORD} ${A2BOOT}
+SUBDIRS = macusers printing shell_utils ${TIMELORD} ${A2BOOT}
 
 EXTRA_DIST = ICDumpSuffixMap

diff --git a/contrib/nu/.cvsignore b/contrib/nu/.cvsignore
deleted file mode 100644 (file)
index 0a72b1e..0000000
--- a/contrib/nu/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-nu

diff --git a/contrib/nu/Makefile.am b/contrib/nu/Makefile.am
deleted file mode 100644 (file)
index 3956ae4..0000000
--- a/contrib/nu/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# Makefile.am for contrib/nu
-
-bin_SCRIPTS = nu
-
-EXTRA_DIST = nu.in

diff --git a/contrib/nu/nu.in b/contrib/nu/nu.in
deleted file mode 100755 (executable)
index 3755fe3..0000000
--- a/contrib/nu/nu.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!@PERL@
-#
-# $Id: nu.in,v 1.1 2002-01-17 05:59:25 srittau Exp $
-#
-# nu - by Anders Brownworth   anders@thehamptons.com
-#      modified by Ambrose Li <acli@mail.mingpaoxpress.com>
-#
-# shows netatalk users logged on
-#
-# usage: nu
-
-open(USERS, "-|") || exec("/bin/ps", "anucx");
-
-while (<USERS>) {
-   push(@users, $1) if /^\s*(\d+)\s.*\bafpd\b/;
-}
-
-close USERS;
-
-print "Netatalk users:\n---------------\n";
-
-foreach $user (@users)
-{
-  if ($user) {  # not root
-    ($name,$_,$_,$_,$_,$_,$gcos) = getpwuid($user);
-    print(defined $gcos && $gcos =~ /^([^,]+)/? $1: $name, "\n");
-  }
-}