4c4
< Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
---
> Portions of this software are Copyright 1996-1999 by Craig Metz, All Rights
16a17,18
> Modified by cmetz for OPIE 2.4. Add id parameter to opielogwtmp. Use
> opiestrncpy(). Fix incorrect use of setproctitle().
49c51
< $FreeBSD: head/contrib/opie/opieftpd.c 62877 2000-07-10 07:30:28Z kris $
---
> $FreeBSD: head/contrib/opie/opieftpd.c 92914 2002-03-21 23:42:52Z markm $
246c248
< int opielogwtmp __P((char *, char *, char *));
---
> int opielogwtmp __P((char *, char *, char *, char *));
513c515
< opielogwtmp(ttyline, "", "");
---
> opielogwtmp(ttyline, "", "", "ftp");
567c569
< opielogwtmp(ttyline, pw->pw_name, remotehost);
---
> opielogwtmp(ttyline, pw->pw_name, remotehost, "ftp");
634,637c636,639
< snprintf(proctitle, sizeof(proctitle), "%s: anonymous/%s", remotehost,
< passwd);
< setproctitle("%s", proctitle);
< #endif /* DOTITLE */
---
> setproctitle("%s: anonymous/%.*s", remotehost,
> sizeof(proctitle) - sizeof(remotehost) - sizeof(": anonymous/"),
> passwd);
> #endif /* DOTITLE */
646,648c648,649
< snprintf(proctitle, sizeof(proctitle), "%s: %s", remotehost, pw->pw_name);
< setproctitle("%s", proctitle);
< #endif /* DOTITLE */
---
> setproctitle("%s: %s", remotehost, pw->pw_name);
> #endif /* DOTITLE */
1259c1260
< strncpy(remotehost, hp->h_name, sizeof(remotehost));
---
> opiestrncpy(remotehost, hp->h_name, sizeof(remotehost));
1261,1262c1262
< strncpy(remotehost, inet_ntoa(sin->sin_addr), sizeof(remotehost));
< remotehost[sizeof(remotehost) - 1] = '\0';
---
> opiestrncpy(remotehost, inet_ntoa(sin->sin_addr), sizeof(remotehost));
1264,1265c1264
< snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost);
< setproctitle("%s", proctitle);
---
> setproctitle("%s: connected", remotehost);
1283c1282
< opielogwtmp(ttyline, "", "");
---
> opielogwtmp(ttyline, "", "", "ftp");