From ac2ff2f73f6c37b44d2ab12c0a0cdbcf37be8eb3 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Thu, 26 Nov 2009 13:41:15 +0000 Subject: sigset() is the name of function specified by SUSv4. Replace it to avoid conflict. MFC after: 3 weeks --- libutil/pw_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libutil/pw_util.c b/libutil/pw_util.c index 69232fb..75459e3 100644 --- a/libutil/pw_util.c +++ b/libutil/pw_util.c @@ -289,7 +289,7 @@ int pw_edit(int notsetuid) { struct sigaction sa, sa_int, sa_quit; - sigset_t oldsigset, sigset; + sigset_t oldsigset, nsigset; struct stat st1, st2; const char *editor; int pstat; @@ -303,9 +303,9 @@ pw_edit(int notsetuid) sa.sa_flags = 0; sigaction(SIGINT, &sa, &sa_int); sigaction(SIGQUIT, &sa, &sa_quit); - sigemptyset(&sigset); - sigaddset(&sigset, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigset, &oldsigset); + sigemptyset(&nsigset); + sigaddset(&nsigset, SIGCHLD); + sigprocmask(SIG_BLOCK, &nsigset, &oldsigset); switch ((editpid = fork())) { case -1: return (-1); -- cgit v1.2.3 From 39568873e3f7967d6882ac64195cf47c2836e62a Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Wed, 2 Dec 2009 15:56:18 +0000 Subject: Make work when included by itself. There are several reasons why it didn't work: - It was missing for __BEGIN_DECLS. - It uses various primitive types that were not declared. --- libutil/libutil.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libutil/libutil.h b/libutil/libutil.h index 3187fb3..fca133f 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -39,6 +39,34 @@ #ifndef _LIBUTIL_H_ #define _LIBUTIL_H_ +#include +#include + +#ifndef _GID_T_DECLARED +typedef __gid_t gid_t; +#define _GID_T_DECLARED +#endif + +#ifndef _INT64_T_DECLARED +typedef __int64_t int64_t; +#define _INT64_T_DECLARED +#endif + +#ifndef _PID_T_DECLARED +typedef __pid_t pid_t; +#define _PID_T_DECLARED +#endif + +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED +#endif + +#ifndef _UID_T_DECLARED +typedef __uid_t uid_t; +#define _UID_T_DECLARED +#endif + #define PROPERTY_MAX_NAME 64 #define PROPERTY_MAX_VALUE 512 -- cgit v1.2.3 From 36a4535e90917bf64db4739b36dacafd20bd6386 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sun, 6 Dec 2009 01:27:28 +0000 Subject: Make pw(8) build without . The size of the username record in utmp files should not influence the maximum username length. Right now ut_user/ut_name is big enough, so in this case it's dead code anyway. --- pw/pw_user.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pw/pw_user.c b/pw/pw_user.c index 4c62fe8..c8364ca 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -41,16 +41,11 @@ static const char rcsid[] = #include #include #include -#include #include #include "pw.h" #include "bitmap.h" -#if (MAXLOGNAME-1) > UT_NAMESIZE -#define LOGNAMESIZE UT_NAMESIZE -#else #define LOGNAMESIZE (MAXLOGNAME-1) -#endif static char locked_str[] = "*LOCKED*"; -- cgit v1.2.3 From 4586c2d56d0b6146515e3dde667ec7ae98aaede2 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Sat, 12 Dec 2009 00:11:40 +0000 Subject: Remove a dead store. MFC after: 5 days --- libutil/gr_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libutil/gr_util.c b/libutil/gr_util.c index 77e0653..633f435 100644 --- a/libutil/gr_util.c +++ b/libutil/gr_util.c @@ -117,8 +117,8 @@ gr_make(const struct group *gr) /* Create the group line and fill it. */ if ((line = malloc(line_size)) == NULL) return (NULL); - line_size = snprintf(line, line_size, group_line_format, gr->gr_name, - gr->gr_passwd, (uintmax_t)gr->gr_gid); + snprintf(line, line_size, group_line_format, gr->gr_name, gr->gr_passwd, + (uintmax_t)gr->gr_gid); if (gr->gr_mem != NULL) for (ndx = 0; gr->gr_mem[ndx] != NULL; ndx++) { strcat(line, gr->gr_mem[ndx]); -- cgit v1.2.3 From 7a03d653054fe10b5016f63aae356f1c3ba8988a Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 2 Jan 2010 10:27:05 +0000 Subject: Build usr.bin/ with WARNS=6 by default. Also add some missing $FreeBSD$ to keep svn happy. --- chpass/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/chpass/Makefile b/chpass/Makefile index e958956..7f7ac51 100644 --- a/chpass/Makefile +++ b/chpass/Makefile @@ -9,7 +9,6 @@ PROG= chpass SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c BINOWN= root BINMODE=4555 -WARNS?= 5 .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif -- cgit v1.2.3 From b3288b566b5f32fa961d74c6f838910c4e5a9c01 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 2 Jan 2010 11:07:44 +0000 Subject: The last big commit: let usr.sbin/ use WARNS=6 by default. --- pw/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pw/Makefile b/pw/Makefile index 8937124..ae0023c 100644 --- a/pw/Makefile +++ b/pw/Makefile @@ -6,6 +6,8 @@ SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \ grupd.c pwupd.c fileupd.c edgroup.c psdate.c \ bitmap.c cpdir.c rm_r.c +WARNS?= 1 + DPADD= ${LIBCRYPT} ${LIBUTIL} LDADD= -lcrypt -lutil -- cgit v1.2.3 From d89214eede07c6ef144e57048e0de150d0a4ff8c Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Wed, 13 Jan 2010 18:59:51 +0000 Subject: Remove login(3), logout(3) and logwtmp(3) from libutil. These functions only apply to utmp(5). They cannot be kept intact when moving towards utmpx. The login(3) function would break, because its argument is an utmp structure. The logout(3) and logwtmp(3) functions cannot be used, since they provide a functionality which partially overlaps. Increment SHLIB_MAJOR to 9 to indicate the removal. --- libutil/libutil.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libutil/libutil.h b/libutil/libutil.h index fca133f..4c2ee3b 100644 --- a/libutil/libutil.h +++ b/libutil/libutil.h @@ -90,7 +90,6 @@ struct pidfh { /* Avoid pulling in all the include files for no need */ struct termios; struct winsize; -struct utmp; struct in_addr; struct kinfo_file; struct kinfo_vmentry; @@ -102,10 +101,7 @@ int extattr_namespace_to_string(int _attrnamespace, char **_string); int extattr_string_to_namespace(const char *_string, int *_attrnamespace); int flopen(const char *_path, int _flags, ...); void hexdump(const void *ptr, int length, const char *hdr, int flags); -void login(struct utmp *_ut); int login_tty(int _fd); -int logout(const char *_line); -void logwtmp(const char *_line, const char *_name, const char *_host); void trimdomain(char *_fullhost, int _hostsize); int openpty(int *_amaster, int *_aslave, char *_name, struct termios *_termp, struct winsize *_winp); -- cgit v1.2.3 From 22fbb722e59acb5b97d466d056f6cd82feaf49dc Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 14 Jan 2010 11:03:26 +0000 Subject: The group field is called `gid', not `group'. --- chpass/chpass.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chpass/chpass.1 b/chpass/chpass.1 index 24b1759..a926607 100644 --- a/chpass/chpass.1 +++ b/chpass/chpass.1 @@ -168,7 +168,7 @@ that manipulate these files will often return only one of the multiple entries, and that one by random selection. .Pp The -.Ar group +.Ar gid field is the group that the user will be placed in at login. Since .Bx -- cgit v1.2.3 From 7670596c5386db5668e6b3b6c8fbf37e378eae91 Mon Sep 17 00:00:00 2001 From: Joel Dahl Date: Thu, 14 Jan 2010 22:04:08 +0000 Subject: Fix a few whitespace issues and comment typos that I found while reading through this file. --- adduser/adduser.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/adduser/adduser.sh b/adduser/adduser.sh index 3d1d6f8..8e05f33 100644 --- a/adduser/adduser.sh +++ b/adduser/adduser.sh @@ -28,20 +28,20 @@ # # err msg -# Display $msg on stderr, unless we're being quiet. -# +# Display $msg on stderr, unless we're being quiet. +# err() { if [ -z "$quietflag" ]; then - echo 1>&2 ${THISCMD}: ERROR: $* + echo 1>&2 ${THISCMD}: ERROR: $* fi } # info msg -# Display $msg on stdout, unless we're being quiet. -# +# Display $msg on stdout, unless we're being quiet. +# info() { if [ -z "$quietflag" ]; then - echo ${THISCMD}: INFO: $* + echo ${THISCMD}: INFO: $* fi } @@ -50,7 +50,7 @@ info() { # is not, output the value of the next higher uid that is available. # If a uid is not specified, output the first available uid, as indicated # by pw(8). -# +# get_nextuid () { _uid=$1 _nextuid= @@ -163,8 +163,7 @@ fullpath_from_shell() { # the path is invalid or it is not executable it # will emit an informational message saying so. # -shell_exists() -{ +shell_exists() { _sh="$1" _shellchk="${GREPCMD} '^$_sh$' ${ETCSHELLS} > /dev/null 2>&1" @@ -647,7 +646,6 @@ input_from_file() { # the user database. # input_interactive() { - _disable= _pass= _passconfirm= @@ -887,7 +885,7 @@ defaultshell="${DEFAULTSHELL}" defaultHomePerm= # Make sure the user running this program is root. This isn't a security -# measure as much as it is a usefull method of reminding the user to +# measure as much as it is a useful method of reminding the user to # 'su -' before he/she wastes time entering data that won't be saved. # procowner=${procowner:-`/usr/bin/id -u`} -- cgit v1.2.3