Date: Tue, 12 Jun 2012 17:02:53 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236965 - in head: etc include lib/libutil share/examples/etc Message-ID: <201206121702.q5CH2rqY065075@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Tue Jun 12 17:02:53 2012 New Revision: 236965 URL: http://svn.freebsd.org/changeset/base/236965 Log: Finally nuke auth.conf, nine years after it was deprecated. The only thing it was still used for was to set the "global default" password hash. Since the stock auth.conf contained nothing but comments, the global default was actually the first algorithm in crypt(3)'s list, which happens to be DES; I take the fact that nobody noticed as proof that it was not used outside of crypt(3). The only other use in our tree was in the Kerberos support code in in tinyware's passwd(1). I removed that code in an earlier commit; it would not have compiled anyway, as it only supported Kerberos IV. The auth_getval() function is now a stub that always returns NULL, which has the same effect as a functional auth_getval() with an empty auth.conf. MFC after: 3 weeks Deleted: head/etc/auth.conf head/lib/libutil/auth.3 head/lib/libutil/auth.conf.5 Modified: head/etc/Makefile head/include/paths.h head/lib/libutil/Makefile head/lib/libutil/auth.c head/lib/libutil/property.3 head/share/examples/etc/README.examples Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jun 12 16:07:03 2012 (r236964) +++ head/etc/Makefile Tue Jun 12 17:02:53 2012 (r236965) @@ -7,8 +7,7 @@ SUBDIR= sendmail .endif -BIN1= auth.conf \ - crontab \ +BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ Modified: head/include/paths.h ============================================================================== --- head/include/paths.h Tue Jun 12 16:07:03 2012 (r236964) +++ head/include/paths.h Tue Jun 12 17:02:53 2012 (r236965) @@ -42,7 +42,6 @@ /* Locate system binaries. */ #define _PATH_SYSPATH "/sbin:/usr/sbin" -#define _PATH_AUTHCONF "/etc/auth.conf" #define _PATH_BSHELL "/bin/sh" #define _PATH_CAPABILITY "/etc/capability" #define _PATH_CAPABILITY_DB "/etc/capability.db" Modified: head/lib/libutil/Makefile ============================================================================== --- head/lib/libutil/Makefile Tue Jun 12 16:07:03 2012 (r236964) +++ head/lib/libutil/Makefile Tue Jun 12 17:02:53 2012 (r236965) @@ -25,14 +25,13 @@ CFLAGS+= -DINET6 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/ -MAN+= auth.3 expand_number.3 flopen.3 fparseln.3 hexdump.3 \ +MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \ humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \ _secure_path.3 trimdomain.3 uucplock.3 -MAN+= auth.conf.5 login.conf.5 -MLINKS+= auth.3 auth_getval.3 +MAN+= login.conf.5 MLINKS+= kld.3 kld_isloaded.3 kld.3 kld_load.3 MLINKS+=login_auth.3 auth_cat.3 login_auth.3 auth_checknologin.3 MLINKS+=login_cap.3 login_close.3 login_cap.3 login_getcapbool.3 \ Modified: head/lib/libutil/auth.c ============================================================================== --- head/lib/libutil/auth.c Tue Jun 12 16:07:03 2012 (r236964) +++ head/lib/libutil/auth.c Tue Jun 12 17:02:53 2012 (r236965) @@ -31,40 +31,14 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <fcntl.h> -#include <libutil.h> -#include <paths.h> -#include <syslog.h> -#include <unistd.h> - -static properties P; - -static int -initauthconf(const char *path) -{ - int fd; +#include <stdlib.h> - if (!P) { - if ((fd = open(path, O_RDONLY)) < 0) { - syslog(LOG_ERR, "initauthconf: unable to open file: %s", path); - return 1; - } - P = properties_read(fd); - close(fd); - if (!P) { - syslog(LOG_ERR, "initauthconf: unable to parse file: %s", path); - return 1; - } - } - return 0; -} +#include <libutil.h> char * auth_getval(const char *name) { - if (!P && initauthconf(_PATH_AUTHCONF)) - return NULL; - else - return property_find(P, name); + + (void)name; + return (NULL); } Modified: head/lib/libutil/property.3 ============================================================================== --- head/lib/libutil/property.3 Tue Jun 12 16:07:03 2012 (r236964) +++ head/lib/libutil/property.3 Tue Jun 12 17:02:53 2012 (r236965) @@ -90,8 +90,6 @@ are desired, the entire value should be characters. Any line beginning with a # or ; character is assumed to be a comment and will be ignored. -.Sh SEE ALSO -.Xr auth_getval 3 .Sh AUTHORS .An Jordan Hubbard .Sh BUGS Modified: head/share/examples/etc/README.examples ============================================================================== --- head/share/examples/etc/README.examples Tue Jun 12 16:07:03 2012 (r236964) +++ head/share/examples/etc/README.examples Tue Jun 12 17:02:53 2012 (r236965) @@ -9,7 +9,6 @@ This directory contains the following fi amd.map - filesystem automounter lookup resolution map (see amd(8)) apmd.conf - configuration file for apmd(8) -auth.conf - authentication capability database (see auth.conf(5)) bsd-style-copyright - copyright style for bsd system crontab - system scheduled command table (see crontab(5)) csh.cshrc - sample .cshrc (see csh(1))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206121702.q5CH2rqY065075>