1c1
< /* $NetBSD: conf.c,v 1.52 2004-08-09 12:56:47 lukem Exp $ */
---
> /* $NetBSD: conf.c,v 1.57 2006/02/01 14:20:12 christos Exp $ */
4c4
< * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
---
> * Copyright (c) 1997-2005 The NetBSD Foundation, Inc.
41c41
< __RCSID("$NetBSD: conf.c,v 1.52 2004-08-09 12:56:47 lukem Exp $");
---
> __RCSID("$NetBSD: conf.c,v 1.57 2006/02/01 14:20:12 christos Exp $");
80c80
< #define DEFAULT_UMASK 027 /* 15 minutes */
---
> #define DEFAULT_UMASK 027 /* rw-r----- */
112c112
< REASSIGN(curclass.motd, xstrdup(_PATH_FTPLOGINMESG));
---
> REASSIGN(curclass.motd, ftpd_strdup(_NAME_FTPLOGINMESG));
128a129
> CURCLASS_FLAGS_CLR(hidesymlinks);
155c156
< REASSIGN(curclass.classname, xstrdup(findclass));
---
> REASSIGN(curclass.classname, ftpd_strdup(findclass));
162c163
< infile = conffilename(_PATH_FTPDCONF);
---
> infile = conffilename(_NAME_FTPDCONF);
208c209
< arg = xstrdup(arg); \
---
> arg = ftpd_strdup(arg); \
313c314
< suffix = xstrdup(arg);
---
> suffix = ftpd_strdup(arg);
320,322c321,323
< types = xstrdup(types);
< disable = xstrdup(disable);
< convcmd = xstrdup(convcmd);
---
> types = ftpd_strdup(types);
> disable = ftpd_strdup(disable);
> convcmd = ftpd_strdup(convcmd);
356a358,360
> } else if (strcasecmp(word, "hidesymlinks") == 0) {
> CONF_FLAG(hidesymlinks);
>
365c369
< EMPTYSTR(p) ? NULL : xstrdup(p));
---
> EMPTYSTR(p) ? NULL : ftpd_strdup(p));
387a392,395
> } else if (strcasecmp(word, "recvbufsize") == 0) {
> curclass.recvbufsize = 0;
> CONF_LL(recvbufsize, arg, 0, LLTMAX);
>
467c475
< REASSIGN(template, EMPTYSTR(arg) ? NULL : xstrdup(arg));
---
> REASSIGN(template, EMPTYSTR(arg) ? NULL : ftpd_strdup(arg));
550c558
< cp = xstrdup(curwd);
---
> cp = ftpd_strdup(curwd);
849c857
< cmd = xstrdup(cp->command);
---
> cmd = ftpd_strdup(cp->command);
855c863
< if (sl_add(sl, xstrdup(lp)) == -1)
---
> if (sl_add(sl, ftpd_strdup(lp)) == -1)