/*
- * $Id: afp_asp.c,v 1.7 2001-12-03 05:03:38 jmarcus Exp $
+ * $Id: afp_asp.c,v 1.17 2002-08-30 19:32:40 didg Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* Copyright (c) 1990,1993 Regents of The University of Michigan.
#include <stdlib.h>
#include <string.h>
#include <signal.h>
-#include <syslog.h>
+#include <atalk/logger.h>
+#include <errno.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif /* HAVE_SYS_TIME_H */
#include "auth.h"
#include "fork.h"
+#ifdef FORCE_UIDGID
+#warning UIDGID
+#include "uid.h"
+#endif /* FORCE_UIDGID */
+
extern struct oforks *writtenfork;
static AFPObj *child;
+static __inline__ void afp_authprint_remove(AFPObj *);
+
static __inline__ void afp_asp_close(AFPObj *obj)
{
ASP asp = obj->handle;
+ if (obj->options.authprintdir) afp_authprint_remove(obj);
+
if (obj->logout)
(*obj->logout)();
+ LOG(log_info, logtype_afpd, "%.2fKB read, %.2fKB written",
+ asp->read_count / 1024.0, asp->write_count / 1024.0);
asp_close( asp );
- syslog(LOG_INFO, "%.2fKB read, %.2fKB written",
- asp->read_count / 1024.0, asp->write_count / 1024.0);
+}
+
+/* removes the authprint trailing when appropriate */
+static __inline__ void afp_authprint_remove(AFPObj *obj)
+{
+ ASP asp = obj->handle;
+ char addr_filename[256];
+ char addr_filename_buff[256];
+ struct stat cap_st;
+
+ sprintf(addr_filename, "%s/net%d.%dnode%d", obj->options.authprintdir,
+ ntohs( asp->asp_sat.sat_addr.s_net )/256,
+ ntohs( asp->asp_sat.sat_addr.s_net )%256,
+ asp->asp_sat.sat_addr.s_node );
+
+ memset( addr_filename_buff, 0, 256 );
+
+ if(stat(addr_filename, &cap_st) == 0) {
+ if( S_ISREG(cap_st.st_mode) ) {
+ int len;
+ int capfd = open( addr_filename, O_RDONLY );
+ if ((len = read( capfd, addr_filename_buff, 256 )) > 0) {
+ int file_pid;
+ char *p_filepid;
+ close(capfd);
+ addr_filename_buff[len] = 0;
+ if ( (p_filepid = strrchr(addr_filename_buff, ':')) != NULL) {
+ *p_filepid = '\0';
+ p_filepid++;
+ file_pid = atoi(p_filepid);
+ if (file_pid == (int)getpid()) {
+ if(unlink(addr_filename) == 0) {
+ LOG(log_info, logtype_afpd, "removed %s", addr_filename);
+ } else {
+ LOG(log_info, logtype_afpd, "error removing %s: %s",
+ addr_filename, strerror(errno));
+ }
+ } else {
+ LOG(log_info, logtype_afpd, "%s belongs to another pid %d",
+ addr_filename, file_pid );
+ }
+ } else { /* no pid info */
+ if (unlink(addr_filename) == 0) {
+ LOG(log_info, logtype_afpd, "removed %s", addr_filename );
+ } else {
+ LOG(log_info, logtype_afpd, "error removing %s: %s",
+ addr_filename, strerror(errno));
+ }
+ }
+ } else {
+ LOG(log_info, logtype_afpd, "couldn't read data from %s", addr_filename );
+ }
+ } else {
+ LOG(log_info, logtype_afpd, "%s is not a regular file", addr_filename );
+ }
+ } else {
+ LOG(log_info, logtype_afpd, "error stat'ing %s: %s",
+ addr_filename, strerror(errno));
+ }
}
static void afp_asp_die(const int sig)
asp_attention(asp, AFPATTN_SHUTDOWN);
if ( asp_shutdown( asp ) < 0 ) {
- syslog( LOG_ERR, "afp_die: asp_shutdown: %m" );
+ LOG(log_error, logtype_afpd, "afp_die: asp_shutdown: %s", strerror(errno) );
}
afp_asp_close(child);
it.it_value.tv_sec = 300;
it.it_value.tv_usec = 0;
if ( setitimer( ITIMER_REAL, &it, 0 ) < 0 ) {
- syslog( LOG_ERR, "afp_timedown: setitimer: %m" );
+ LOG(log_error, logtype_afpd, "afp_timedown: setitimer: %s", strerror(errno) );
afp_asp_die(1);
}
sigemptyset( &sv.sa_mask );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGALRM, &sv, 0 ) < 0 ) {
- syslog( LOG_ERR, "afp_timedown: sigaction: %m" );
+ LOG(log_error, logtype_afpd, "afp_timedown: sigaction: %s", strerror(errno) );
afp_asp_die(1);
}
}
sigemptyset( &action.sa_mask );
action.sa_flags = SA_RESTART;
if ( sigaction( SIGHUP, &action, 0 ) < 0 ) {
- syslog( LOG_ERR, "afp_over_asp: sigaction: %m" );
+ LOG(log_error, logtype_afpd, "afp_over_asp: sigaction: %s", strerror(errno) );
afp_asp_die(1);
}
sigemptyset( &action.sa_mask );
action.sa_flags = SA_RESTART;
if ( sigaction( SIGTERM, &action, 0 ) < 0 ) {
- syslog( LOG_ERR, "afp_over_asp: sigaction: %m" );
+ LOG(log_error, logtype_afpd, "afp_over_asp: sigaction: %s", strerror(errno) );
afp_asp_die(1);
}
- syslog( LOG_INFO, "session from %u.%u:%u on %u.%u:%u",
- ntohs( asp->asp_sat.sat_addr.s_net ),
- asp->asp_sat.sat_addr.s_node, asp->asp_sat.sat_port,
- ntohs( atp_sockaddr( asp->asp_atp )->sat_addr.s_net ),
- atp_sockaddr( asp->asp_atp )->sat_addr.s_node,
- atp_sockaddr( asp->asp_atp )->sat_port );
+ LOG(log_info, logtype_afpd, "session from %u.%u:%u on %u.%u:%u",
+ ntohs( asp->asp_sat.sat_addr.s_net ),
+ asp->asp_sat.sat_addr.s_node, asp->asp_sat.sat_port,
+ ntohs( atp_sockaddr( asp->asp_atp )->sat_addr.s_net ),
+ atp_sockaddr( asp->asp_atp )->sat_addr.s_node,
+ atp_sockaddr( asp->asp_atp )->sat_port );
while ((reply = asp_getrequest(asp))) {
switch (reply) {
case ASPFUNC_CLOSE :
- if (obj->options.authprintdir) {
- char addr_filename[256];
- struct stat cap_st;
-
- sprintf(addr_filename, "%s/net%d.%dnode%d", obj->options.authprintdir,
- ntohs( asp->asp_sat.sat_addr.s_net )/256,
- ntohs( asp->asp_sat.sat_addr.s_net )%256,
- asp->asp_sat.sat_addr.s_node );
-
- if(stat(addr_filename, &cap_st) == 0) {
- if(unlink(addr_filename) == 0) {
- syslog(LOG_INFO, "removed %s", addr_filename);
- } else {
- syslog(LOG_INFO, "error removing %s: %m", addr_filename);
- }
- } else {
- syslog(LOG_INFO, "error stat'ing %s: %m", addr_filename);
- }
- }
-
afp_asp_close(obj);
- syslog( LOG_INFO, "done" );
+ LOG(log_info, logtype_afpd, "done" );
if ( obj->options.flags & OPTION_DEBUG ) {
printf( "done\n" );
#ifdef AFS
if ( writtenfork ) {
if ( flushfork( writtenfork ) < 0 ) {
- syslog( LOG_ERR, "main flushfork: %m" );
+ LOG(log_error, logtype_afpd, "main flushfork: %s",
+ strerror(errno));
}
writtenfork = NULL;
}
#endif /* AFS */
func = (u_char) asp->commands[0];
if ( obj->options.flags & OPTION_DEBUG ) {
- printf( "command: %d\n", func );
+ printf("command: %d (%s)\n", func, AfpNum2name(func));
bprint( asp->commands, asp->cmdlen );
}
if ( afp_switch[ func ] != NULL ) {
reply = (*afp_switch[ func ])(obj,
asp->commands, asp->cmdlen,
asp->data, &asp->datalen);
+#ifdef FORCE_UIDGID
+ /* bring everything back to old euid, egid */
+ if (obj->force_uid)
+ restore_uidgid ( &obj->uidgid );
+#endif /* FORCE_UIDGID */
} else {
- syslog( LOG_ERR, "bad function %X", func );
+ LOG(log_error, logtype_afpd, "bad function %X", func );
asp->datalen = 0;
reply = AFPERR_NOOP;
}
}
if ( asp_cmdreply( asp, reply ) < 0 ) {
- syslog( LOG_ERR, "asp_cmdreply: %m" );
+ LOG(log_error, logtype_afpd, "asp_cmdreply: %s", strerror(errno) );
afp_asp_die(1);
}
break;
reply = (*afp_switch[ func ])(obj,
asp->commands, asp->cmdlen,
asp->data, &asp->datalen);
+#ifdef FORCE_UIDGID
+ /* bring everything back to old euid, egid */
+ if (obj->force_uid)
+ restore_uidgid ( &obj->uidgid );
+#endif /* FORCE_UIDGID */
} else {
- syslog( LOG_ERR, "(write) bad function %X", func );
+ LOG(log_error, logtype_afpd, "(write) bad function %X", func );
asp->datalen = 0;
reply = AFPERR_NOOP;
}
bprint( asp->data, asp->datalen );
}
if ( asp_wrtreply( asp, reply ) < 0 ) {
- syslog( LOG_ERR, "asp_wrtreply: %m" );
+ LOG(log_error, logtype_afpd, "asp_wrtreply: %s", strerror(errno) );
afp_asp_die(1);
}
break;
* Bad asp packet. Probably should have asp filter them,
* since they are typically things like out-of-order packet.
*/
- syslog( LOG_INFO, "main: asp_getrequest: %d", reply );
+ LOG(log_info, logtype_afpd, "main: asp_getrequest: %d", reply );
break;
}
projects / netatalk.git / blobdiff