regen patches
This commit is contained in:
parent
e2cb0ecfe8
commit
4baf96ac84
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-bin_afile_common_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- bin/afile/common.c.orig Fri Jun 29 10:14:46 2001
|
||||
+++ bin/afile/common.c Sat Dec 31 11:14:53 2005
|
||||
@@ -64,22 +64,23 @@ char *dataname_to_adname(const char *dat
|
||||
$OpenBSD: patch-bin_afile_common_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- bin/afile/common.c.orig Fri Jun 29 16:14:46 2001
|
||||
+++ bin/afile/common.c Thu Oct 25 20:30:05 2007
|
||||
@@ -64,22 +64,23 @@ char *dataname_to_adname(const char *dataname)
|
||||
{
|
||||
const char *filepart;
|
||||
char *adname;
|
||||
@ -33,7 +33,7 @@ $OpenBSD: patch-bin_afile_common_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
}
|
||||
|
||||
return adname;
|
||||
@@ -89,20 +90,21 @@ char *adname_to_dataname(const char *adn
|
||||
@@ -89,20 +90,21 @@ char *adname_to_dataname(const char *adname)
|
||||
{
|
||||
const char *filepart;
|
||||
char *dataname;
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- bin/afppasswd/afppasswd.c.orig Wed Feb 9 20:23:07 2005
|
||||
+++ bin/afppasswd/afppasswd.c Fri Dec 30 22:25:07 2005
|
||||
$OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- bin/afppasswd/afppasswd.c.orig Thu Feb 10 02:23:07 2005
|
||||
+++ bin/afppasswd/afppasswd.c Thu Oct 25 20:30:05 2007
|
||||
@@ -64,7 +64,7 @@
|
||||
#define HEXPASSWDLEN 16
|
||||
#define PASSWDLEN 8
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
|
||||
/* if newpwd is null, convert buf from hex to binary. if newpwd isn't
|
||||
* null, convert newpwd to hex and save it in buf. */
|
||||
@@ -117,7 +117,7 @@ static void convert_passwd(char *buf, ch
|
||||
@@ -117,7 +117,7 @@ static void convert_passwd(char *buf, char *newpwd, co
|
||||
/* this matches the code in uam_randnum.c */
|
||||
static int update_passwd(const char *path, const char *name, int flags)
|
||||
{
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
FILE *fp;
|
||||
off_t pos;
|
||||
int keyfd = -1, err = 0;
|
||||
@@ -128,9 +128,9 @@ static int update_passwd(const char *pat
|
||||
@@ -128,9 +128,9 @@ static int update_passwd(const char *path, const char
|
||||
}
|
||||
|
||||
/* open the key file if it exists */
|
||||
@ -31,7 +31,7 @@ $OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
keyfd = open(buf, O_RDONLY);
|
||||
}
|
||||
|
||||
@@ -154,8 +154,8 @@ static int update_passwd(const char *pat
|
||||
@@ -154,8 +154,8 @@ static int update_passwd(const char *path, const char
|
||||
}
|
||||
|
||||
if (flags & OPT_ADDUSER) {
|
||||
@ -42,7 +42,7 @@ $OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
p = strchr(buf, ':') + 1;
|
||||
fwrite(buf, strlen(buf), 1, fp);
|
||||
} else {
|
||||
@@ -239,8 +239,8 @@ static int create_file(const char *path,
|
||||
@@ -239,8 +239,8 @@ static int create_file(const char *path, uid_t minuid)
|
||||
/* a little paranoia */
|
||||
if (strlen(pwd->pw_name) + FORMAT_LEN > sizeof(buf) - 1)
|
||||
continue;
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
len = strlen(buf);
|
||||
if (write(fd, buf, len) != len) {
|
||||
fprintf(stderr, "afppasswd: problem writing to %s: %s\n", path,
|
||||
@@ -255,6 +255,22 @@ static int create_file(const char *path,
|
||||
@@ -255,6 +255,22 @@ static int create_file(const char *path, uid_t minuid)
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-bin_megatron_megatron_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- bin/megatron/megatron.c.orig Sun Apr 28 21:52:49 2002
|
||||
+++ bin/megatron/megatron.c Fri Dec 30 22:34:51 2005
|
||||
@@ -246,7 +246,7 @@ int megatron( path, module, newname, fla
|
||||
$OpenBSD: patch-bin_megatron_megatron_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- bin/megatron/megatron.c.orig Mon Apr 29 03:52:49 2002
|
||||
+++ bin/megatron/megatron.c Thu Oct 25 20:30:05 2007
|
||||
@@ -246,7 +246,7 @@ int megatron( path, module, newname, flags )
|
||||
*/
|
||||
|
||||
if (*newname)
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-bin_megatron_nad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- bin/megatron/nad.c.orig Wed Feb 9 20:23:08 2005
|
||||
+++ bin/megatron/nad.c Sat Dec 31 11:43:27 2005
|
||||
$OpenBSD: patch-bin_megatron_nad_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- bin/megatron/nad.c.orig Thu Feb 10 02:23:08 2005
|
||||
+++ bin/megatron/nad.c Thu Oct 25 20:30:05 2007
|
||||
@@ -414,8 +414,8 @@ void select_charset( int options)
|
||||
#endif /* HEXOUTPUT */
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-bin_megatron_nad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
int offset[ NUMFORKS ];
|
||||
struct adouble ad;
|
||||
} nad;
|
||||
@@ -451,9 +451,10 @@ int nad_open( path, openflags, fh, optio
|
||||
@@ -451,9 +451,10 @@ int nad_open( path, openflags, fh, options )
|
||||
|
||||
if ( openflags == O_RDONLY ) {
|
||||
initvol(path);
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-bin_megatron_nad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
for ( fork = 0 ; fork < NUMFORKS ; fork++ ) {
|
||||
if ( stat( nad.adpath[ fork ], &st ) < 0 ) {
|
||||
if ( errno == ENOENT ) {
|
||||
@@ -478,10 +479,11 @@ int nad_open( path, openflags, fh, optio
|
||||
@@ -478,10 +479,11 @@ int nad_open( path, openflags, fh, options )
|
||||
|
||||
} else {
|
||||
initvol (".");
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-bin_uniconv_uniconv_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- bin/uniconv/uniconv.c.orig Sun Jul 11 20:15:18 2004
|
||||
+++ bin/uniconv/uniconv.c Fri Dec 30 22:51:44 2005
|
||||
$OpenBSD: patch-bin_uniconv_uniconv_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- bin/uniconv/uniconv.c.orig Mon Jul 12 02:15:18 2004
|
||||
+++ bin/uniconv/uniconv.c Thu Oct 25 20:30:05 2007
|
||||
@@ -105,7 +105,7 @@ static int veto(const char *path)
|
||||
|
||||
static int do_rename( char* src, char *dst, struct stat *st)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-bin_uniconv_uniconv_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
struct stat tmp_st;
|
||||
|
||||
if (!stat(dst, &tmp_st)) {
|
||||
@@ -121,7 +121,7 @@ static int do_rename( char* src, char *d
|
||||
@@ -121,7 +121,7 @@ static int do_rename( char* src, char *dst, struct sta
|
||||
if (S_ISDIR(st->st_mode))
|
||||
return 0;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-etc_afpd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/afpd/auth.c.orig Fri Mar 11 10:36:58 2005
|
||||
+++ etc/afpd/auth.c Fri Dec 30 23:14:23 2005
|
||||
@@ -244,7 +244,7 @@ static int login(AFPObj *obj, struct pas
|
||||
$OpenBSD: patch-etc_afpd_auth_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/afpd/auth.c.orig Fri Mar 11 16:36:58 2005
|
||||
+++ etc/afpd/auth.c Thu Oct 25 20:30:05 2007
|
||||
@@ -244,7 +244,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void
|
||||
int mypid = getpid();
|
||||
struct stat stat_buf;
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-etc_afpd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
addr_net / 256, addr_net % 256, addr_node);
|
||||
LOG(log_info, logtype_afpd, "registering %s (uid %d) on %u.%u as %s",
|
||||
pwd->pw_name, pwd->pw_uid, addr_net, addr_node, nodename);
|
||||
@@ -333,7 +333,7 @@ static int login(AFPObj *obj, struct pas
|
||||
@@ -333,7 +333,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void
|
||||
else
|
||||
clientname = inet_ntoa( dsi->client.sin_addr );
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-etc_afpd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
|
||||
if( sia_become_user( NULL, argc, argv, hostname, pwd->pw_name,
|
||||
NULL, FALSE, NULL, NULL,
|
||||
@@ -999,7 +999,7 @@ int auth_register(const int type, struct
|
||||
@@ -999,7 +999,7 @@ int auth_register(const int type, struct uam_obj *uam)
|
||||
/* load all of the modules */
|
||||
int auth_load(const char *path, const char *list)
|
||||
{
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-etc_afpd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
struct uam_mod *mod;
|
||||
struct stat st;
|
||||
size_t len;
|
||||
@@ -1011,9 +1011,9 @@ int auth_load(const char *path, const ch
|
||||
@@ -1011,9 +1011,9 @@ int auth_load(const char *path, const char *list)
|
||||
if ((p = strtok(buf, ",")) == NULL)
|
||||
return -1;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-etc_afpd_directory_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/afpd/directory.c.orig Wed Feb 9 20:23:10 2005
|
||||
+++ etc/afpd/directory.c Sat Dec 31 14:16:49 2005
|
||||
$OpenBSD: patch-etc_afpd_directory_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/afpd/directory.c.orig Thu Feb 10 02:23:10 2005
|
||||
+++ etc/afpd/directory.c Thu Oct 25 20:30:05 2007
|
||||
@@ -681,7 +681,7 @@ int netatalk_unlink(const char *name)
|
||||
/* ------------------- */
|
||||
static int deletedir(char *dir)
|
||||
@ -39,7 +39,7 @@ $OpenBSD: patch-etc_afpd_directory_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
DIR *dp;
|
||||
struct dirent *de;
|
||||
struct stat st;
|
||||
@@ -754,13 +754,13 @@ static int copydir(const struct vol *vol
|
||||
@@ -754,13 +754,13 @@ static int copydir(const struct vol *vol, char *src, c
|
||||
}
|
||||
|
||||
/* set things up to copy */
|
||||
@ -57,7 +57,7 @@ $OpenBSD: patch-etc_afpd_directory_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
dlen++;
|
||||
drem = sizeof(dpath) - dlen -1;
|
||||
|
||||
@@ -774,14 +774,14 @@ static int copydir(const struct vol *vol
|
||||
@@ -774,14 +774,14 @@ static int copydir(const struct vol *vol, char *src, c
|
||||
err = AFPERR_PARAM;
|
||||
break;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-etc_afpd_mangle_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/afpd/mangle.c.orig Mon Feb 14 11:01:54 2005
|
||||
+++ etc/afpd/mangle.c Sat Dec 31 14:19:54 2005
|
||||
$OpenBSD: patch-etc_afpd_mangle_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/afpd/mangle.c.orig Mon Feb 14 17:01:54 2005
|
||||
+++ etc/afpd/mangle.c Thu Oct 25 20:30:05 2007
|
||||
@@ -235,7 +235,7 @@ unsigned char *
|
||||
mangle(const struct vol *vol, unsigned char *filename, size_t filenamelen, unsigned char *uname, cnid_t id, int flags) {
|
||||
unsigned char *ext = NULL;
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-etc_afpd_mangle_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
unsigned char mangle_suffix[MANGLE_LENGTH + 1];
|
||||
size_t ext_len = 0;
|
||||
size_t maxlen;
|
||||
@@ -259,19 +259,19 @@ mangle(const struct vol *vol, unsigned c
|
||||
@@ -259,19 +259,19 @@ mangle(const struct vol *vol, unsigned char *filename,
|
||||
ext_len = MAX_EXT_LENGTH;
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-etc_afpd_unix_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/afpd/unix.c.orig Tue Jun 15 18:53:55 2004
|
||||
+++ etc/afpd/unix.c Fri Dec 30 23:04:27 2005
|
||||
$OpenBSD: patch-etc_afpd_unix_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/afpd/unix.c.orig Wed Jun 16 00:53:55 2004
|
||||
+++ etc/afpd/unix.c Thu Oct 25 20:30:05 2007
|
||||
@@ -342,8 +342,8 @@ const mode_t mode;
|
||||
strcmp( deskp->d_name, ".." ) == 0 || strlen( deskp->d_name ) > 2 ) {
|
||||
continue;
|
||||
@ -109,7 +109,7 @@ $OpenBSD: patch-etc_afpd_unix_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) {
|
||||
LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
|
||||
uid, gid, fullpathname(buf), strerror(errno) );
|
||||
@@ -788,8 +788,8 @@ static int recursive_chown(const char *p
|
||||
@@ -788,8 +788,8 @@ static int recursive_chown(const char *path, uid_t uid
|
||||
struct dirent *entry;
|
||||
char *name;
|
||||
int ret = 0;
|
||||
@ -129,7 +129,7 @@ $OpenBSD: patch-etc_afpd_unix_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
int i;
|
||||
struct stat pd_stat;
|
||||
uid_t uid;
|
||||
@@ -840,7 +840,7 @@ int unix_rename(const char *oldpath, con
|
||||
@@ -840,7 +840,7 @@ int unix_rename(const char *oldpath, const char *newpa
|
||||
if (rename(oldpath, newpath) < 0)
|
||||
return -1;
|
||||
#if 0
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/afpd/volume.c.orig Sun Apr 24 18:26:31 2005
|
||||
+++ etc/afpd/volume.c Sat Dec 31 12:09:29 2005
|
||||
@@ -231,13 +231,14 @@ static char *volxlate(AFPObj *obj, char
|
||||
$OpenBSD: patch-etc_afpd_volume_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/afpd/volume.c.orig Mon Apr 25 00:26:31 2005
|
||||
+++ etc/afpd/volume.c Thu Oct 25 20:30:05 2007
|
||||
@@ -231,13 +231,14 @@ static char *volxlate(AFPObj *obj, char *dest, size_t
|
||||
return NULL;
|
||||
}
|
||||
if (!dest) {
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
if ((p = strchr(src, '$')) == NULL) /* nothing to do */
|
||||
return ret;
|
||||
|
||||
@@ -262,7 +263,7 @@ static char *volxlate(AFPObj *obj, char
|
||||
@@ -262,7 +263,7 @@ static char *volxlate(AFPObj *obj, char *dest, size_t
|
||||
if (obj->proto == AFPPROTO_ASP) {
|
||||
ASP asp = obj->handle;
|
||||
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
asp->asp_sat.sat_addr.s_node);
|
||||
dest += len;
|
||||
destlen -= len;
|
||||
@@ -270,7 +271,7 @@ static char *volxlate(AFPObj *obj, char
|
||||
@@ -270,7 +271,7 @@ static char *volxlate(AFPObj *obj, char *dest, size_t
|
||||
} else if (obj->proto == AFPPROTO_DSI) {
|
||||
DSI *dsi = obj->handle;
|
||||
|
||||
@ -36,7 +36,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
ntohs(dsi->client.sin_port));
|
||||
dest += len;
|
||||
destlen -= len;
|
||||
@@ -291,7 +292,7 @@ static char *volxlate(AFPObj *obj, char
|
||||
@@ -291,7 +292,7 @@ static char *volxlate(AFPObj *obj, char *dest, size_t
|
||||
if (obj->proto == AFPPROTO_ASP) {
|
||||
ASP asp = obj->handle;
|
||||
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
dest += len;
|
||||
destlen -= len;
|
||||
|
||||
@@ -606,14 +607,13 @@ static int creatvol(AFPObj *obj, struct
|
||||
@@ -606,14 +607,13 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
|
||||
free(volume);
|
||||
return -1;
|
||||
}
|
||||
@ -147,7 +147,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
}
|
||||
|
||||
/* check allow/deny lists:
|
||||
@@ -2103,9 +2103,9 @@ static int create_special_folder (const
|
||||
@@ -2103,9 +2103,9 @@ static int create_special_folder (const struct vol *vo
|
||||
u_int16_t attr;
|
||||
struct stat st;
|
||||
int ret;
|
||||
@ -159,7 +159,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
if ( p == NULL) {
|
||||
LOG(log_error, logtype_afpd,"malloc failed");
|
||||
exit (EXITERR_SYS);
|
||||
@@ -2117,8 +2117,8 @@ static int create_special_folder (const
|
||||
@@ -2117,8 +2117,8 @@ static int create_special_folder (const struct vol *vo
|
||||
exit (EXITERR_SYS);
|
||||
}
|
||||
|
||||
@ -170,7 +170,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
|
||||
r=q;
|
||||
while (*r) {
|
||||
@@ -2128,7 +2128,7 @@ static int create_special_folder (const
|
||||
@@ -2128,7 +2128,7 @@ static int create_special_folder (const struct vol *vo
|
||||
*r=tolower(*r);
|
||||
r++;
|
||||
}
|
||||
@ -179,7 +179,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
|
||||
if ( (ret = stat( p, &st )) < 0 ) {
|
||||
if (folder->precreate) {
|
||||
@@ -2259,7 +2259,7 @@ static int savevoloptions (const struct
|
||||
@@ -2259,7 +2259,7 @@ static int savevoloptions (const struct vol *vol)
|
||||
snprintf(item, sizeof(item), "CNIDDBDPORT:%u\n", Cnid_port);
|
||||
strlcat(buf, item, sizeof(buf));
|
||||
|
||||
@ -188,7 +188,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
if (vol->v_dbpath)
|
||||
strlcat(item, vol->v_dbpath, sizeof(item));
|
||||
else
|
||||
@@ -2268,7 +2268,7 @@ static int savevoloptions (const struct
|
||||
@@ -2268,7 +2268,7 @@ static int savevoloptions (const struct vol *vol)
|
||||
strlcat(buf, item, sizeof(buf));
|
||||
|
||||
/* volume flags */
|
||||
@ -197,7 +197,7 @@ $OpenBSD: patch-etc_afpd_volume_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
for (;op->name; op++) {
|
||||
if ( (vol->v_flags & op->option) ) {
|
||||
strlcat(item, op->name, sizeof(item));
|
||||
@@ -2279,7 +2279,7 @@ static int savevoloptions (const struct
|
||||
@@ -2279,7 +2279,7 @@ static int savevoloptions (const struct vol *vol)
|
||||
strlcat(buf, item, sizeof(buf));
|
||||
|
||||
/* casefold flags */
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-etc_cnid_dbd_cnid_metad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/cnid_dbd/cnid_metad.c.orig Mon Sep 6 03:19:21 2004
|
||||
+++ etc/cnid_dbd/cnid_metad.c Sat Dec 31 12:40:35 2005
|
||||
@@ -270,8 +270,8 @@ static int maybe_start_dbd(char *dbdpn,
|
||||
$OpenBSD: patch-etc_cnid_dbd_cnid_metad_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/cnid_dbd/cnid_metad.c.orig Mon Sep 6 09:19:21 2004
|
||||
+++ etc/cnid_dbd/cnid_metad.c Thu Oct 25 20:30:06 2007
|
||||
@@ -270,8 +270,8 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, c
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-etc_cnid_dbd_cnid_metad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
|
||||
if (up->count == MAXSPAWN) {
|
||||
/* there's a pb with the db inform child
|
||||
@@ -298,7 +298,7 @@ static int maybe_start_dbd(char *dbdpn,
|
||||
@@ -298,7 +298,7 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, c
|
||||
}
|
||||
|
||||
/* ------------------ */
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-etc_cnid_dbd_cnid_metad_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
@@ -310,11 +310,11 @@ static int set_dbdir(char *dbdir, int le
|
||||
@@ -310,11 +310,11 @@ static int set_dbdir(char *dbdir, int len)
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-etc_papd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- etc/papd/auth.c.orig Fri Mar 11 10:36:59 2005
|
||||
+++ etc/papd/auth.c Sat Dec 31 13:10:37 2005
|
||||
@@ -96,7 +96,7 @@ int auth_register(const int type, struct
|
||||
$OpenBSD: patch-etc_papd_auth_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- etc/papd/auth.c.orig Fri Mar 11 16:36:59 2005
|
||||
+++ etc/papd/auth.c Thu Oct 25 20:30:06 2007
|
||||
@@ -96,7 +96,7 @@ int auth_register(const int type, struct uam_obj *uam)
|
||||
/* load all of the modules */
|
||||
int auth_load(const char *path, const char *list)
|
||||
{
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-etc_papd_auth_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
struct uam_mod *mod;
|
||||
struct stat st;
|
||||
int len;
|
||||
@@ -108,9 +108,9 @@ int auth_load(const char *path, const ch
|
||||
@@ -108,9 +108,9 @@ int auth_load(const char *path, const char *list)
|
||||
if ((p = strtok(buf, ",")) == NULL)
|
||||
return -1;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libatalk_cnid_cdb_cnid_cdb_open_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- libatalk/cnid/cdb/cnid_cdb_open.c.orig Sun Mar 21 23:38:51 2004
|
||||
+++ libatalk/cnid/cdb/cnid_cdb_open.c Sat Dec 31 00:26:34 2005
|
||||
@@ -179,21 +179,22 @@ static struct _cnid_db *cnid_cdb_new(con
|
||||
$OpenBSD: patch-libatalk_cnid_cdb_cnid_cdb_open_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- libatalk/cnid/cdb/cnid_cdb_open.c.orig Mon Mar 22 05:38:51 2004
|
||||
+++ libatalk/cnid/cdb/cnid_cdb_open.c Thu Oct 25 20:30:06 2007
|
||||
@@ -179,21 +179,22 @@ static struct _cnid_db *cnid_cdb_new(const char *volpa
|
||||
/* --------------- */
|
||||
static int upgrade_required(char *dbdir)
|
||||
{
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-libatalk_cnid_cdb_cnid_cdb_open_c,v 1.1 2006/09/22 05:56:25 pval
|
||||
CNID_private *db;
|
||||
struct _cnid_db *cdb;
|
||||
int open_flag, len;
|
||||
@@ -223,7 +224,7 @@ struct _cnid_db *cnid_cdb_open(const cha
|
||||
@@ -223,7 +224,7 @@ struct _cnid_db *cnid_cdb_open(const char *dir, mode_t
|
||||
|
||||
/* this checks .AppleDB.
|
||||
We need space for dir + '/' + DBHOMELEN + '/' + DBLEN */
|
||||
@ -50,7 +50,7 @@ $OpenBSD: patch-libatalk_cnid_cdb_cnid_cdb_open_c,v 1.1 2006/09/22 05:56:25 pval
|
||||
LOG(log_error, logtype_default, "cnid_open: Pathname too large: %s", dir);
|
||||
return NULL;
|
||||
}
|
||||
@@ -241,13 +242,12 @@ struct _cnid_db *cnid_cdb_open(const cha
|
||||
@@ -241,13 +242,12 @@ struct _cnid_db *cnid_cdb_open(const char *dir, mode_t
|
||||
cdb->_private = (void *) db;
|
||||
db->magic = CNID_DB_MAGIC;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libatalk_cnid_dbd_cnid_dbd_c,v 1.1 2006/09/22 05:56:25 pvalchev Exp $
|
||||
--- libatalk/cnid/dbd/cnid_dbd.c.orig Sun Feb 6 05:16:03 2005
|
||||
+++ libatalk/cnid/dbd/cnid_dbd.c Sat Dec 31 11:56:19 2005
|
||||
@@ -52,7 +52,7 @@ static void RQST_RESET(struct cnid_dbd_r
|
||||
$OpenBSD: patch-libatalk_cnid_dbd_cnid_dbd_c,v 1.2 2007/10/25 18:57:32 steven Exp $
|
||||
--- libatalk/cnid/dbd/cnid_dbd.c.orig Sun Feb 6 11:16:03 2005
|
||||
+++ libatalk/cnid/dbd/cnid_dbd.c Thu Oct 25 20:30:06 2007
|
||||
@@ -52,7 +52,7 @@ static void RQST_RESET(struct cnid_dbd_rqst *r)
|
||||
}
|
||||
|
||||
/* ----------- */
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-libatalk_cnid_dbd_cnid_dbd_c,v 1.1 2006/09/22 05:56:25 pvalchev
|
||||
extern int Cnid_port;
|
||||
|
||||
static int tsock_getfd(char *host, int port)
|
||||
@@ -398,7 +398,7 @@ struct _cnid_db *cnid_dbd_open(const cha
|
||||
@@ -398,7 +398,7 @@ struct _cnid_db *cnid_dbd_open(const char *dir, mode_t
|
||||
|
||||
/* We keep a copy of the directory in the db structure so that we can
|
||||
transparently reconnect later. */
|
||||
|
Loading…
Reference in New Issue
Block a user