#include <stdio.h>
#include <stdlib.h>
-/* STDC check */
-#if STDC_HEADERS
#include <string.h>
-#else /* STDC_HEADERS */
-#ifndef HAVE_STRCHR
-#define strchr index
-#define strrchr index
-#endif /* HAVE_STRCHR */
-char *strchr (), *strrchr ();
-#ifndef HAVE_MEMCPY
-#define memcpy(d,s,n) bcopy ((s), (d), (n))
-#define memmove(d,s,n) bcopy ((s), (d), (n))
-#endif /* ! HAVE_MEMCPY */
-#endif /* STDC_HEADERS */
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
#include <errno.h>
#include <sys/param.h>
#include "filedir.h"
#include "unix.h"
-#ifdef DROPKLUDGE
-int matchfile2dirperms(
-/* Since it's kinda' big; I decided against an
- inline function */
- char *upath,
- struct vol *vol,
- int did)
-/* The below code changes the way file ownership is determined in the name of
- fixing dropboxes. It has known security problem. See the netatalk FAQ for
- more information */
-{
- struct stat st, sb;
- struct dir *dir;
- char *adpath;
- uid_t uid;
- int ret = AFP_OK;
-#ifdef DEBUG
- LOG(log_debug9, logtype_afpd, "begin matchfile2dirperms:");
-#endif
-
- if (stat(upath, &st ) < 0) {
- LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno));
- return AFPERR_NOOBJ ;
- }
-
- adpath = vol->vfs->ad_path( upath, ADFLAGS_HF );
- /* FIXME dirsearch doesn't move cwd to did ! */
- if (( dir = dirlookup( vol, did )) == NULL ) {
- LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info.");
- ret = AFPERR_NOOBJ;
- }
- else if (stat(".", &sb) < 0) {
- LOG(log_error, logtype_afpd,
- "matchfile2dirperms: Error checking directory \"%s\": %s",
- dir->d_m_name, strerror(errno));
- ret = AFPERR_NOOBJ;
- }
- else {
- uid=geteuid();
- if ( uid != sb.st_uid )
- {
- seteuid(0);
- if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
- {
- LOG(log_error, logtype_afpd,
- "matchfile2dirperms(%s): Error changing owner/gid: %s",
- upath, strerror(errno));
- ret = AFPERR_ACCESS;
- }
- else if ((!S_ISLNK(st->st_mode)) && (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0))
- {
- LOG(log_error, logtype_afpd,
- "matchfile2dirperms(%s): Error adding file read permissions: %s",
- upath, strerror(errno));
- ret = AFPERR_ACCESS;
- }
- else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
- {
- LOG(log_error, logtype_afpd,
- "matchfile2dirperms(%s): Error changing AppleDouble owner/gid: %s",
- adpath, strerror(errno));
- ret = AFPERR_ACCESS;
- }
- else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
- {
- LOG(log_error, logtype_afpd,
- "matchfile2dirperms(%s): Error adding AD file read permissions: %s",
- adpath, strerror(errno));
- ret = AFPERR_ACCESS;
- }
- seteuid(uid);
- }
- } /* end else if stat success */
-
-#ifdef DEBUG
- LOG(log_debug9, logtype_afpd, "end matchfile2dirperms:");
-#endif
- return ret;
-}
-#endif
-
int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
{
struct stat *st;
struct vol *vol;
struct dir *dir;
- u_int32_t did;
+ uint32_t did;
int ret;
size_t buflen;
- u_int16_t fbitmap, dbitmap, vid;
+ uint16_t fbitmap, dbitmap, vid;
struct path *s_path;
*rbuflen = 0;
return AFPERR_NOOBJ;
ret = getdirparams(vol, dbitmap, s_path, dir,
- rbuf + 3 * sizeof( u_int16_t ), &buflen );
+ rbuf + 3 * sizeof( uint16_t ), &buflen );
if (ret != AFP_OK )
return( ret );
}
/* this is a directory */
- *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR;
+ *(rbuf + 2 * sizeof( uint16_t )) = (char) FILDIRBIT_ISDIR;
} else {
if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir,
- rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) {
+ rbuf + 3 * sizeof( uint16_t ), &buflen )) ) {
return( ret );
}
/* this is a file */
- *(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISFILE;
+ *(rbuf + 2 * sizeof( uint16_t )) = FILDIRBIT_ISFILE;
}
- *rbuflen = buflen + 3 * sizeof( u_int16_t );
+ *rbuflen = buflen + 3 * sizeof( uint16_t );
fbitmap = htons( fbitmap );
memcpy( rbuf, &fbitmap, sizeof( fbitmap ));
rbuf += sizeof( fbitmap );
struct vol *vol;
struct dir *dir;
struct path *path;
- u_int16_t vid, bitmap;
+ uint16_t vid, bitmap;
int did, rc;
*rbuflen = 0;
"moveandrename: [\"%s\"/\"%s\"] -> \"%s\"",
cfrombstr(sdir->d_u_name), oldname, newname);
- ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(&ad, vol);
adp = &ad;
adflags = 0;
}
}
if (!ad_metadata(oldunixname, adflags, adp)) {
- u_int16_t bshort;
+ uint16_t bshort;
ad_getattr(adp, &bshort);
- ad_close_metadata( adp);
+
+ ad_close(adp, ADFLAGS_HF);
if ((bshort & htons(ATTRBIT_NORENAME))) {
rc = AFPERR_OLOCK;
goto exit;
if (!ad_metadata(upath, adflags, adp)) {
ad_setid(adp, st->st_dev, st->st_ino, id, curdir->d_did, vol->v_stamp);
ad_flush(adp);
- ad_close_metadata(adp);
+ ad_close(adp, ADFLAGS_HF);
}
/* fix up the catalog entry */
struct dir *sdir;
char *oldname, *newname;
struct path *path;
- u_int32_t did;
+ uint32_t did;
int plen;
- u_int16_t vid;
+ uint16_t vid;
int isdir = 0;
int rc;
struct path *s_path;
char *upath;
int did, rc;
- u_int16_t vid;
+ uint16_t vid;
*rbuflen = 0;
ibuf += 2;
int did;
int pdid;
int plen;
- u_int16_t vid;
+ uint16_t vid;
int rc;
-#ifdef DROPKLUDGE
- int retvalue;
-#endif /* DROPKLUDGE */
int sdir_fd = -1;
rc = AFPERR_PARAM;
goto exit;
}
- curdir->d_offcnt++;
- sdir->d_offcnt--;
-#ifdef DROPKLUDGE
- if (vol->v_flags & AFPVOL_DROPBOX) {
- /* FIXME did is not always the source id */
- if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) {
- rc = retvalue;
- goto exit;
- }
+ /* if unix priv don't try to match perm with dest folder */
+ if (!isdir && !vol_unix_priv(vol)) {
+ int admode = ad_mode("", 0777) | vol->v_fperm;
+
+ setfilmode(upath, admode, NULL, vol->v_umask);
+ vol->vfs->vfs_setfilmode(vol, upath, admode, NULL);
}
- else
-#endif /* DROPKLUDGE */
- /* if unix priv don't try to match perm with dest folder */
- if (!isdir && !vol_unix_priv(vol)) {
- int admode = ad_mode("", 0777) | vol->v_fperm;
-
- setfilmode(upath, admode, NULL, vol->v_umask);
- vol->vfs->vfs_setfilmode(vol, upath, admode, NULL);
- }
setvoltime(obj, vol );
}