upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-23 15:19:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflict with <paths.h> by renaming _PATH_LOGIN to _PATH_SLIP_LOGIN,

Browse source 
and likewise LOGOUT for consistency.  Fix a few nearby style bugs.
This commit is contained in:
Garrett Wollman 2002-05-30 21:26:49 +00:00
parent 0bc013b1a6
commit f70bb54433
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr.sbin/sliplogin/pathnames.h
View file

@ -30,7 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
* From: @(#)pathnames.h 8.1 (Berkeley) 6/6/93
* $FreeBSD$
*/
#ifndef COMPAT
@ -41,7 +42,7 @@
#define _PATH_ACCESS "/etc/sliphome/slip.hosts"
#define _PATH_SLPARMS "/etc/sliphome/slip.slparms"
#define _PATH_LOGIN "/etc/sliphome/slip.login"
#define _PATH_LOGOUT "/etc/sliphome/slip.logout"
#define _PATH_SLIP_LOGIN "/etc/sliphome/slip.login"
#define _PATH_SLIP_LOGOUT "/etc/sliphome/slip.logout"
#define _PATH_DEBUG "/tmp/sliplogin.XXXXXX"

18
usr.sbin/sliplogin/sliplogin.c
View file

@ -202,14 +202,16 @@ findid(name)
* one specific to this host. If none found, try for
* a generic one.
*/
(void)snprintf(loginfile, sizeof(loginfile), "%s.%s", _PATH_LOGIN, name);
(void)snprintf(loginfile, sizeof(loginfile), "%s.%s",
_PATH_SLIP_LOGIN, name);
if (access(loginfile, R_OK|X_OK) != 0) {
(void)strncpy(loginfile, _PATH_LOGIN, sizeof(loginfile)-1);
loginfile[sizeof(loginfile)-1] = '\0';
(void)strncpy(loginfile, _PATH_SLIP_LOGIN,
sizeof(loginfile) - 1);
loginfile[sizeof(loginfile) - 1] = '\0';
if (access(loginfile, R_OK|X_OK)) {
syslog(LOG_ERR,
"access denied for %s - no %s\n",
name, _PATH_LOGIN);
name, _PATH_SLIP_LOGIN);
exit(5);
}
}
@ -307,10 +309,12 @@ hup_handler(s)
(void) close(0);
seteuid(0);
(void)snprintf(logoutfile, sizeof(logoutfile), "%s.%s", _PATH_LOGOUT, loginname);
(void)snprintf(logoutfile, sizeof(logoutfile), "%s.%s",
_PATH_SLIP_LOGOUT, loginname);
if (access(logoutfile, R_OK|X_OK) != 0) {
(void)strncpy(logoutfile, _PATH_LOGOUT, sizeof(logoutfile)-1);
logoutfile[sizeof(logoutfile)-1] = '\0';
(void)strncpy(logoutfile, _PATH_SLIP_LOGOUT,
sizeof(logoutfile) - 1);
logoutfile[sizeof(logoutfile) - 1] = '\0';
}
if (access(logoutfile, R_OK|X_OK) == 0) {
char logincmd[2*MAXPATHLEN+32];