diff options
author | gad <gad@FreeBSD.org> | 2001-06-15 22:03:07 +0000 |
---|---|---|
committer | gad <gad@FreeBSD.org> | 2001-06-15 22:03:07 +0000 |
commit | e402d6c9159ae45f5056765c53cebfe6c25ee35e (patch) | |
tree | 34bd9934cba11944407fb52a6d7f9c516d667752 /usr.sbin/lpr/common_source/rmjob.c | |
parent | 134649df9dfcfa24c39e28dcbf0b24db1b8f9605 (diff) | |
download | FreeBSD-src-e402d6c9159ae45f5056765c53cebfe6c25ee35e.zip FreeBSD-src-e402d6c9159ae45f5056765c53cebfe6c25ee35e.tar.gz |
Rename a few global variables which hold hostname-related values to be
more sensible/understandable. 'from'->'from_host' 'host'->'local_host'
'fromb'->'frombuf' 'fromhost'->'origin_host' and a local-variable
named 'host'->'hostbuf'. This fixes some compile-time warnings about
local variables shadowing global variables.
Other than renaming variables, the only actual code changes are to call
strlcpy() instead of strncpy() when setting those (renamed) variables,
and that 'from_ip' is now a strdup()-created buffer instead of being a
static buffer compiled in as 1025 bytes.
Reviewed by: freebsd-print@bostonradio.org (an earlier version)
MFC after: 1 week
Diffstat (limited to 'usr.sbin/lpr/common_source/rmjob.c')
-rw-r--r-- | usr.sbin/lpr/common_source/rmjob.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 39a7d0f..3a60efb 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -106,9 +106,9 @@ rmjob(const char *printer) } } if (!strcmp(person, "-all")) { - if (from == host) + if (from_host == local_host) fatal(pp, "The login name \"-all\" is reserved"); - all = 1; /* all those from 'from' */ + all = 1; /* all those from 'from_host' */ person = root; } @@ -218,8 +218,8 @@ do_unlink(char *file) { int ret; - if (from != host) - printf("%s: ", host); + if (from_host != local_host) + printf("%s: ", local_host); seteuid(euid); ret = unlink(file); seteuid(uid); @@ -242,7 +242,7 @@ chk(char *file) if (strlen(file) < 7 || file[0] != 'c' || file[1] != 'f') return(0); - if (all && (from == host || !strcmp(from, file+6))) + if (all && (from_host == local_host || !strcmp(from_host, file+6))) return(1); /* @@ -288,12 +288,13 @@ chk(char *file) int isowner(char *owner, char *file) { - if (!strcmp(person, root) && (from == host || !strcmp(from, file+6))) + if (!strcmp(person, root) && (from_host == local_host || + !strcmp(from_host, file+6))) return (1); - if (!strcmp(person, owner) && !strcmp(from, file+6)) + if (!strcmp(person, owner) && !strcmp(from_host, file+6)) return (1); - if (from != host) - printf("%s: ", host); + if (from_host != local_host) + printf("%s: ", local_host); printf("%s: Permission denied\n", file); return(0); } @@ -362,8 +363,8 @@ rmremote(const struct printer *pp) rem = getport(pp, pp->remote_host, 0); (void)signal(SIGALRM, savealrm); if (rem < 0) { - if (from != host) - printf("%s: ", host); + if (from_host != local_host) + printf("%s: ", local_host); printf("connection to %s is down\n", pp->remote_host); } else { if (writev(rem, iov, niov) != totlen) |