gmane.linux.utilities.util-linux-ng

[PATCH 3/3] su: Mention SUID_* feature.

Thomas Schwinge — 2012-05-25T18:41:01

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 Documentation/howto-compilation.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/howto-compilation.txt b/Documentation/howto-compilation.txt
index 3617b34..bebe0d2 100644
--- a/Documentation/howto-compilation.txt
+++ b/Documentation/howto-compilation.txt
< at >< at > -25,7 +25,7 < at >< at > Compiling
 ./configure SUID_CFLAGS="-fpie" SUID_LDFLAGS="-pie"
 
 The SUID_* feature is currently supported for chfn, chsh,
-newgrp, write, mount, and umount.
+newgrp, su, write, mount, and umount.
 
 Preferred compilation options for developers, when
 using gcc, are:

[PATCH 1/3] su: Don't include the unused .

Thomas Schwinge — 2012-05-25T18:40:59

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 login-utils/su.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/login-utils/su.c b/login-utils/su.c
index edd6d10..29042f0 100644
--- a/login-utils/su.c
+++ b/login-utils/su.c
< at >< at > -81,7 +81,6 < at >< at > enum
 # include <security/pam_misc.h>
 # include <signal.h>
 # include <sys/wait.h>
-# include <sys/fsuid.h>
 #endif
 
 #if HAVE_SYSLOG_H && HAVE_SYSLOG

lnussel/su-v1: Portability patch for GNU/Hurd

Thomas Schwinge — 2012-05-25T18:40:58

Hi!

Only the first (and tiny) patch is needed for portability; the other two
are just general clean-up.

Then, su appears to work -- based on a bit of manual testing that I have
just done.


Grüße,
 Thomas
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] su: Add AM_LDFLAGS to su_LDFLAGS.

Thomas Schwinge — 2012-05-25T18:41:00

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 login-utils/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 60e6f10..d376234 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
< at >< at > -89,7 +89,7 < at >< at > su_CFLAGS = -DUSE_PAM=1 $(SUID_CFLAGS) $(AM_CFLAGS)
 chfn_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 chsh_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 newgrp_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-su_LDFLAGS = $(SUID_LDFLAGS)
+su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 
 login_ldadd_common += -lpam -lpam_misc

[PATCH 7/7] setsid: Include instead of .

Thomas Schwinge — 2012-05-25T18:16:18

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 sys-utils/setsid.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 6d1eeda..52ad38f 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
< at >< at > -15,7 +15,7 < at >< at >
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <termio.h>
+#include <sys/ioctl.h>
 
 #include "c.h"
 #include "nls.h"

[PATCH 5/7] write: Use PATH_MAX instead of MAXPATHLEN, as elsewhere.

Thomas Schwinge — 2012-05-25T18:16:16

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 term-utils/write.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/term-utils/write.c b/term-utils/write.c
index c8aca7e..901ddc4 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
< at >< at > -102,7 +102,7 < at >< at > int main(int argc, char **argv)
 time_t atime;
 uid_t myuid;
 int msgsok, myttyfd, c;
-char tty[MAXPATHLEN], *mytty;
+char tty[PATH_MAX], *mytty;
 
 static const struct option longopts[] = {
 {"version", no_argument, NULL, 'V'},
< at >< at > -296,7 +296,7 < at >< at > void search_utmp(char *user, char *tty, char *mytty, uid_t myuid)
 int term_chk(char *tty, int *msgsokP, time_t * atimeP, int showerror)
 {
 struct stat s;
-char path[MAXPATHLEN];
+char path[PATH_MAX];
 
 if (strlen(tty) + 6 > sizeof(path))
 return 1;
< at >< at > -321,7 +321,7 < at >< at > void do_write(char *tty, char *mytty, uid_t myuid)
 char *login, *pwuid, *nows;
 struct passwd *pwd;
 time_t now;
-char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
+char path[PATH_MAX], host[MAXHOSTNAMELEN], line[512];
 
 /* Determine our login name(s) before the we reopen() stdout */
 if ((pwd = getpwuid(myuid)) != NULL)

[PATCH 6/7] write: Don't explicitly include .

Thomas Schwinge — 2012-05-25T18:16:17

It doesn't exist on some systems, but will come in via <sys/param.h> on the
others.

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 term-utils/write.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/term-utils/write.c b/term-utils/write.c
index 901ddc4..9964e08 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
< at >< at > -57,7 +57,6 < at >< at >
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <paths.h>
-#include <asm/param.h>
 #include <getopt.h>
 
 #include "c.h"

[PATCH 4/7] login: Include only if it exists.

Thomas Schwinge — 2012-05-25T18:16:15

It isn't required on non-Linux systems.

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 login-utils/login.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/login-utils/login.c b/login-utils/login.c
index f459b79..7384940 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
< at >< at > -49,7 +49,9 < at >< at >
 #include <stdlib.h>
 #include <sys/syslog.h>
 #include <sys/sysmacros.h>
-#include <linux/major.h>
+#ifdef HAVE_LINUX_MAJOR_H
+# include <linux/major.h>
+#endif
 #include <netdb.h>
 #include <lastlog.h>
 #include <security/pam_appl.h>

[PATCH 3/7] last, login, write: Provide a fallback for MAXHOSTNAMELEN, as elsewhere.

Thomas Schwinge — 2012-05-25T18:16:14

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 login-utils/last.c  |    8 ++++++++
 login-utils/login.c |    8 ++++++++
 term-utils/write.c  |    8 ++++++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/login-utils/last.c b/login-utils/last.c
index 1b1bee1..4d09c4b 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
< at >< at > -62,6 +62,14 < at >< at >
 #include "xalloc.h"
 #include "c.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 #defineSECDAY(24*60*60)/* seconds in a day */
 #defineNO0/* false/no */
 #defineYES1/* true/yes */
diff --git a/login-utils/login.c b/login-utils/login.c
index 7b4f8b5..f459b79 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
< at >< at > -71,6 +71,14 < at >< at >
 
 #include "logindefs.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 #define is_pam_failure(_rc)((_rc) != PAM_SUCCESS)
 
 #define LOGIN_MAX_TRIES        3
diff --git a/term-utils/write.c b/term-utils/write.c
index 2a94792..c8aca7e 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
< at >< at > -65,6 +65,14 < at >< at >
 #include "closestream.h"
 #include "nls.h"
 
+#ifndef MAXHOSTNAMELEN
+# ifdef HOST_NAME_MAX
+#  define MAXHOSTNAMELEN HOST_NAME_MAX
+# else
+#  define MAXHOSTNAMELEN 64
+# endif
+#endif
+
 static void __attribute__ ((__noreturn__)) usage(FILE * out);
 void search_utmp(char *, char *, char *, uid_t);
 void do_write(char *, char *, uid_t);

[PATCH 2/7] arch, eject, elvtune: Gracefully disable on non-Linux platforms.

Thomas Schwinge — 2012-05-25T18:16:13

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 76f73a1..cd8fa4e 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -628,9 +628,9 < at >< at > AC_ARG_ENABLE([most-builds],
   [], enable_most_builds=no
 )
 if test "x$enable_most_builds" = xyes; then
-  enable_arch=yes
+  enable_arch=check
   enable_ddate=yes
-  enable_elvtune=yes
+  enable_elvtune=check
   enable_last=yes
   enable_line=yes
   enable_mesg=yes
< at >< at > -862,7 +862,7 < at >< at > AC_SUBST([ruman1dir])
 
 AC_ARG_ENABLE([eject],
   AS_HELP_STRING([--disable-eject], [do not build eject]),
-  [], enable_eject=yes
+  [], enable_eject=check
 )
 UL_BUILD_INIT([eject])
 UL_REQUIRES_LINUX([eject])

[PATCH 1/7] kill, raw, rename: Don't explicitly enable for --enable-most-builds.

Thomas Schwinge — 2012-05-25T18:16:12

They're already dealt with in the default configuration.

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 configure.ac |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb67ada..76f73a1 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -631,12 +631,9 < at >< at > if test "x$enable_most_builds" = xyes; then
   enable_arch=yes
   enable_ddate=yes
   enable_elvtune=yes
-  enable_kill=yes
   enable_last=yes
   enable_line=yes
   enable_mesg=yes
-  enable_raw=yes
-  enable_rename=yes
   enable_reset=yes
   enable_login_utils=yes
   enable_write=yes

[PATCH] test_pager: Repair build for non-Linux.

Thomas Schwinge — 2012-05-25T18:13:41

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 lib/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index aed0ecd..01b59dc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
< at >< at > -27,6 +27,7 < at >< at > test_blkdev_SOURCES = blkdev.c
 test_ismounted_SOURCES = ismounted.c
 test_wholedisk_SOURCES = wholedisk.c
 test_mangle_SOURCES = mangle.c
+test_pager_SOURCES = pager.c
 
 test_at_SOURCES = at.c
 test_at_CFLAGS = -DTEST_PROGRAM_AT
< at >< at > -38,7 +39,6 < at >< at > test_procutils_SOURCES = procutils.c
 if LINUX
 test_cpuset_SOURCES = cpuset.c
 test_sysfs_SOURCES = sysfs.c at.c
-test_pager_SOURCES = pager.c
 test_sysfs_CFLAGS = -DTEST_PROGRAM_SYSFS
 
 test_loopdev_SOURCES = \

Portability patches for GNU/Hurd

Thomas Schwinge — 2012-05-25T18:13:40

Hi!

The subject says is all.  :-)


Grüße,
 Thomas

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] kill: Check the correct variable when configuring.

Thomas Schwinge — 2012-05-25T18:11:22

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a1b1e9b..eb67ada 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -976,7 +976,7 < at >< at > AC_ARG_ENABLE([kill],
 )
 UL_BUILD_INIT([kill])
 UL_REQUIRES_LINUX([kill])
-AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
+AM_CONDITIONAL(BUILD_KILL, test "x$build_kill" = xyes)
 
 
 AC_ARG_ENABLE([last],

Re: [PULL] su

Ludwig Nussel — 2012-05-25T09:55:39

Done.

cu
Ludwig

Re: [PULL] su

Karel Zak — 2012-05-25T07:41:11

 Good work, thanks.


 It would be nice to cleanup the code (remove non-PAM stuff) before
 merge. Can you do this in your su branch? Please.

    Karel

[PULL] su

Ludwig Nussel — 2012-05-24T12:58:01

Hi,

coreutils isn't really interested in maintaining su anymore.
Distributions have to add custom patches to fix bugs and add
features. The worst offender is probably the pam patch. Fortunately
we managed to sync the patch between openSUSE and Fedora meanwhile.
Over time the risk that the patches divert again increases though.
Since util-linux now contains a common login program it looks like a
good new home for su too.

To integrate su into util-linux I've extracted the history of the su
program until the last GPLv2 version (they've changed to GPLv3
meanwhile) from coreutils' git and merged it with util-linux.
Then I've added the patches used in Fedora and openSUSE and fixed the
files to actually build.

You can find the result in branch su-v1 (ff6b15d) at
git-9UaJU3cA/F/QT0dZR+AlfA< at >public.gmane.org:lnussel/util-linux.git

I've also filed a pull request on github:
https://github.com/karelzak/util-linux/pull/10

Originally I had planned to implement separate tty allocation for
the child program on top of that to get rid of the evil setsid
patch. It turned out to be more complicated than I thought though. The
change would be too massive to backport anyways I guess. So the next
step would be to rip out the non-pam legacy stuff and clean up the code
to make it readable again.

cu
Ludwig

Re: [PATCH 2/3] logger: use memcpy instead of bcopy

Mike Frysinger — 2012-05-23T22:43:50

wonder if it'd be useful to add local defines for bcopy() & friends that result 
in an error if people try to use them ...
-mike

[PATCH 3/3] logger: mark decode/pencode as static

Dave Reisner — 2012-05-23T20:36:00

Move these functions to the top of the file where they can be marked
static and the prototypes can be removed.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/logger.c |   84 +++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 47 deletions(-)

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index a187227..fda22d8 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -58,12 +58,46 < at >< at >
 #defineSYSLOG_NAMES
 #include <syslog.h>
 
-intdecode (char *, CODE *);
-intpencode (char *);
-
 static int optd = 0;
 static uint16_t udpport = 514;
 
+static int decode(char *name, CODE *codetab)
+{
+register CODE *c;
+
+if (isdigit(*name))
+return (atoi(name));
+
+for (c = codetab; c->c_name; c++)
+if (!strcasecmp(name, c->c_name))
+return (c->c_val);
+
+return -1;
+}
+
+static int pencode(char *s)
+{
+char *save;
+int fac, lev;
+
+for (save = s; *s && *s != '.'; ++s);
+if (*s) {
+*s = '\0';
+fac = decode(save, facilitynames);
+if (fac < 0)
+errx(EXIT_FAILURE, _("unknown facility name: %s."), save);
+*s++ = '.';
+}
+else {
+fac = LOG_USER;
+s = save;
+}
+lev = decode(s, prioritynames);
+if (lev < 0)
+errx(EXIT_FAILURE, _("unknown priority name: %s."), save);
+return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
+}
+
 static int
 myopenlog(const char *sock) {
        int fd;
< at >< at > -302,47 +336,3 < at >< at > main(int argc, char **argv) {
 
 return EXIT_SUCCESS;
 }
-
-/*
- *  Decode a symbolic name to a numeric value
- */
-int
-pencode(char *s)
-{
-char *save;
-int fac, lev;
-
-for (save = s; *s && *s != '.'; ++s);
-if (*s) {
-*s = '\0';
-fac = decode(save, facilitynames);
-if (fac < 0)
-errx(EXIT_FAILURE,
-    _("unknown facility name: %s."), save);
-*s++ = '.';
-}
-else {
-fac = LOG_USER;
-s = save;
-}
-lev = decode(s, prioritynames);
-if (lev < 0)
-errx(EXIT_FAILURE,
-    _("unknown priority name: %s."), save);
-return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
-}
-
-int
-decode(char *name, CODE *codetab)
-{
-register CODE *c;
-
-if (isdigit(*name))
-return (atoi(name));
-
-for (c = codetab; c->c_name; c++)
-if (!strcasecmp(name, c->c_name))
-return (c->c_val);

[PATCH 2/3] logger: use memcpy instead of bcopy

Dave Reisner — 2012-05-23T20:35:59

bcopy is marked legacy in POSIX.1-2001 and should not be used.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/logger.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 19b4c47..a187227 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -96,7 +96,7 < at >< at > udpopenlog(const char *servername, uint16_t port) {
 if ((fd = socket(AF_INET, SOCK_DGRAM , 0)) == -1)
 err(EXIT_FAILURE, _("socket"));
 
-bcopy(serverhost->h_addr,&s_addr.sin_addr,serverhost->h_length);
+memcpy(serverhost->h_addr,&s_addr.sin_addr,serverhost->h_length);
         s_addr.sin_family=AF_INET;
         s_addr.sin_port=htons(port);

[PATCH 1/3] logger: avoid explicit fclose(stdout)

Dave Reisner — 2012-05-23T20:35:58

This is done for us via an atexit hook since c05a80ca6385b8. Avoids a
useless 'Write error' on exit whenever invoking the tool.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/logger.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 067272a..19b4c47 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -248,8 +248,6 < at >< at > main(int argc, char **argv) {
 else
 LogSock = myopenlog(usock);
 
-(void) fclose(stdout);