mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
262 lines
5.9 KiB
Diff
262 lines
5.9 KiB
Diff
--- bsd-finger-0.17.orig/finger/finger.1
|
|
+++ bsd-finger-0.17/finger/finger.1
|
|
@@ -169,16 +169,14 @@
|
|
must be able to see the
|
|
.Pa .nofinger
|
|
file. This generally means that the home directory containing the file
|
|
-must have the other-users-execute bit set (o+w). See
|
|
+must have the other-users-execute bit set (o+x). See
|
|
.Xr chmod 1 .
|
|
If you use this feature for privacy, please test it with ``finger
|
|
@localhost'' before relying on it, just in case.
|
|
.It ~/.plan
|
|
.It ~/.project
|
|
-.It ~/.pgp
|
|
+.It ~/.pgpkey
|
|
These files are printed as part of a long-format request. The
|
|
-.Pa .project
|
|
-file is limited to one line; the
|
|
.Pa .plan
|
|
file may be arbitrarily long.
|
|
.El
|
|
--- bsd-finger-0.17.orig/finger/finger.c
|
|
+++ bsd-finger-0.17/finger/finger.c
|
|
@@ -77,7 +77,7 @@
|
|
#include "../version.h"
|
|
|
|
static void loginlist(void);
|
|
-static void userlist(int argc, char *argv[]);
|
|
+static int userlist(int argc, char *argv[]);
|
|
|
|
int lflag, pplan;
|
|
static int sflag, mflag;
|
|
@@ -92,6 +92,7 @@
|
|
|
|
int main(int argc, char *argv[]) {
|
|
int ch;
|
|
+ int err = 0;
|
|
struct sockaddr_in sin;
|
|
socklen_t slen = sizeof(sin);
|
|
|
|
@@ -159,7 +160,7 @@
|
|
}
|
|
}
|
|
else {
|
|
- userlist(argc, argv);
|
|
+ err = userlist(argc, argv);
|
|
/*
|
|
* Assign explicit "large" format if names given and -s not
|
|
* explicitly stated. Force the -l AFTER we get names so any
|
|
@@ -172,7 +173,7 @@
|
|
if (lflag) lflag_print();
|
|
else sflag_print();
|
|
}
|
|
- return 0;
|
|
+ return err;
|
|
}
|
|
|
|
/* Returns 1 if .nofinger is found and enable_nofinger is set. */
|
|
@@ -181,10 +182,16 @@
|
|
check_nofinger(struct passwd *pw)
|
|
{
|
|
if (enable_nofinger) {
|
|
- char path[PATH_MAX];
|
|
struct stat tripe;
|
|
- snprintf(path, sizeof(path), "%s/.nofinger", pw->pw_dir);
|
|
- if (stat(path, &tripe)==0) {
|
|
+ int ret;
|
|
+ char *path;
|
|
+ if (asprintf(&path, "%s/.nofinger", pw->pw_dir) < 0) {
|
|
+ eprintf("finger: Out of space.\n");
|
|
+ exit(1);
|
|
+ }
|
|
+ ret = stat(path, &tripe);
|
|
+ free(path);
|
|
+ if (!ret) {
|
|
return 1;
|
|
}
|
|
}
|
|
@@ -264,10 +271,11 @@
|
|
|
|
}
|
|
|
|
-static void
|
|
+static int
|
|
userlist(int argc, char *argv[])
|
|
{
|
|
int i;
|
|
+ int err = 0;
|
|
PERSON *pn;
|
|
PERSON *nethead, **nettail;
|
|
struct utmp *uptr;
|
|
@@ -297,13 +305,13 @@
|
|
|
|
/* handle network requests */
|
|
for (pn = nethead; pn; pn = pn->next) {
|
|
- netfinger(pn->name);
|
|
+ err |= netfinger(pn->name);
|
|
if (pn->next || entries)
|
|
xputc('\n');
|
|
}
|
|
|
|
if (entries == 0)
|
|
- return;
|
|
+ return err;
|
|
|
|
/*
|
|
* Scan thru the list of users currently logged in, saving
|
|
@@ -331,4 +339,6 @@
|
|
enter_lastlog(pn);
|
|
}
|
|
endutent();
|
|
+
|
|
+ return err;
|
|
}
|
|
--- bsd-finger-0.17.orig/finger/finger.h
|
|
+++ bsd-finger-0.17/finger/finger.h
|
|
@@ -92,7 +92,7 @@
|
|
void enter_where(struct utmp *ut, PERSON *pn);
|
|
void enter_lastlog(PERSON *pn);
|
|
int match(struct passwd *pw, const char *user);
|
|
-void netfinger(const char *name);
|
|
+int netfinger(const char *name);
|
|
const char *prphone(const char *num);
|
|
|
|
#ifndef DAYSPERNYEAR
|
|
--- bsd-finger-0.17.orig/finger/lprint.c
|
|
+++ bsd-finger-0.17/finger/lprint.c
|
|
@@ -48,7 +48,7 @@
|
|
#include <sys/types.h>
|
|
#include <sys/file.h>
|
|
#include <sys/stat.h>
|
|
-#include <sys/time.h>
|
|
+#include <time.h>
|
|
#include "finger.h"
|
|
|
|
static void lprint(PERSON *pn);
|
|
@@ -100,7 +100,7 @@
|
|
* office, office phone, home phone if available
|
|
*/
|
|
xprintf("Login: %-15s\t\t\tName: %s\nDirectory: %-25s",
|
|
- pn->name, pn->realname, pn->dir);
|
|
+ pn->name, pn->realname ? pn->realname : "", pn->dir);
|
|
xprintf("\tShell: %-s\n", *pn->shell ? pn->shell : _PATH_BSHELL);
|
|
|
|
/*
|
|
--- bsd-finger-0.17.orig/finger/net.c
|
|
+++ bsd-finger-0.17/finger/net.c
|
|
@@ -51,7 +51,7 @@
|
|
#include <ctype.h>
|
|
#include "finger.h"
|
|
|
|
-void netfinger(const char *name) {
|
|
+int netfinger(const char *name) {
|
|
register FILE *fp;
|
|
struct in_addr defaddr;
|
|
register int c, sawret, ateol;
|
|
@@ -62,7 +62,7 @@
|
|
char *alist[1], *host;
|
|
|
|
host = strrchr(name, '@');
|
|
- if (!host) return;
|
|
+ if (!host) return 1;
|
|
*host++ = '\0';
|
|
|
|
memset(&sn, 0, sizeof(sn));
|
|
@@ -70,7 +70,7 @@
|
|
sp = getservbyname("finger", "tcp");
|
|
if (!sp) {
|
|
eprintf("finger: tcp/finger: unknown service\n");
|
|
- return;
|
|
+ return 1;
|
|
}
|
|
sn.sin_port = sp->s_port;
|
|
|
|
@@ -78,7 +78,7 @@
|
|
if (!hp) {
|
|
if (!inet_aton(host, &defaddr)) {
|
|
eprintf("finger: unknown host: %s\n", host);
|
|
- return;
|
|
+ return 1;
|
|
}
|
|
def.h_name = host;
|
|
def.h_addr_list = alist;
|
|
@@ -96,7 +96,7 @@
|
|
|
|
if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
|
|
eprintf("finger: socket: %s\n", strerror(errno));
|
|
- return;
|
|
+ return 1;
|
|
}
|
|
|
|
/* print hostname before connecting, in case it takes a while */
|
|
@@ -104,7 +104,7 @@
|
|
if (connect(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
|
|
eprintf("finger: connect: %s\n", strerror(errno));
|
|
close(s);
|
|
- return;
|
|
+ return 1;
|
|
}
|
|
|
|
/* -l flag for remote fingerd */
|
|
@@ -128,7 +128,7 @@
|
|
if (!fp) {
|
|
eprintf("finger: fdopen: %s\n", strerror(errno));
|
|
close(s);
|
|
- return;
|
|
+ return 1;
|
|
}
|
|
|
|
sawret = 0;
|
|
@@ -152,4 +152,6 @@
|
|
}
|
|
if (!ateol) xputc('\n');
|
|
fclose(fp);
|
|
+
|
|
+ return 0;
|
|
}
|
|
--- bsd-finger-0.17.orig/finger/sprint.c
|
|
+++ bsd-finger-0.17/finger/sprint.c
|
|
@@ -40,7 +40,7 @@
|
|
#endif /* not lint */
|
|
|
|
#include <sys/types.h>
|
|
-#include <sys/time.h>
|
|
+#include <time.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
--- bsd-finger-0.17.orig/finger/util.c
|
|
+++ bsd-finger-0.17/finger/util.c
|
|
@@ -64,7 +64,7 @@
|
|
struct stat sb;
|
|
|
|
/* No device for X console. Utmp entry by XDM login (":0"). */
|
|
- if (w->tty[0] == ':') {
|
|
+ if (strchr(w->tty, ':')) {
|
|
w->idletime = 0; /* would be nice to have it emit ??? */
|
|
w->writable = 0;
|
|
return;
|
|
@@ -109,9 +109,8 @@
|
|
* fields[3] -> homephone
|
|
*/
|
|
nfields = 0;
|
|
- for (p = strtok(bp, ","); p; p = strtok(NULL, ",")) {
|
|
- if (*p==0) p = NULL; // skip empties
|
|
- if (nfields < 4) fields[nfields++] = p;
|
|
+ while ((p = strsep(&bp, ","))) {
|
|
+ if (nfields < 4) fields[nfields++] = *p ? p : NULL;
|
|
}
|
|
while (nfields<4) fields[nfields++] = NULL;
|
|
|
|
@@ -150,6 +149,9 @@
|
|
|
|
pn->realname = rname;
|
|
}
|
|
+ else {
|
|
+ pn->realname = NULL;
|
|
+ }
|
|
|
|
pn->office = fields[1] ? strdup(fields[1]) : NULL;
|
|
pn->officephone = fields[2] ? strdup(fields[2]) : NULL;
|