/*
- * $Id: afp_asp.c,v 1.15 2002-03-23 17:43:10 sibaz Exp $
+ * $Id: afp_asp.c,v 1.16 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* Copyright (c) 1990,1993 Regents of The University of Michigan.
if (obj->logout)
(*obj->logout)();
- LOG(log_info, logtype_default, "%.2fKB read, %.2fKB written",
+ LOG(log_info, logtype_afpd, "%.2fKB read, %.2fKB written",
asp->read_count / 1024.0, asp->write_count / 1024.0);
asp_close( asp );
}
file_pid = atoi(p_filepid);
if (file_pid == (int)getpid()) {
if(unlink(addr_filename) == 0) {
- LOG(log_info, logtype_default, "removed %s", addr_filename);
+ LOG(log_info, logtype_afpd, "removed %s", addr_filename);
} else {
- LOG(log_info, logtype_default, "error removing %s: %s",
+ LOG(log_info, logtype_afpd, "error removing %s: %s",
addr_filename, strerror(errno));
}
} else {
- LOG(log_info, logtype_default, "%s belongs to another pid %d",
+ 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_default, "removed %s", addr_filename );
+ LOG(log_info, logtype_afpd, "removed %s", addr_filename );
} else {
- LOG(log_info, logtype_default, "error removing %s: %s",
+ LOG(log_info, logtype_afpd, "error removing %s: %s",
addr_filename, strerror(errno));
}
}
} else {
- LOG(log_info, logtype_default, "couldn't read data from %s", addr_filename );
+ LOG(log_info, logtype_afpd, "couldn't read data from %s", addr_filename );
}
} else {
- LOG(log_info, logtype_default, "%s is not a regular file", addr_filename );
+ LOG(log_info, logtype_afpd, "%s is not a regular file", addr_filename );
}
} else {
- LOG(log_info, logtype_default, "error stat'ing %s: %s",
+ LOG(log_info, logtype_afpd, "error stat'ing %s: %s",
addr_filename, strerror(errno));
}
}
asp_attention(asp, AFPATTN_SHUTDOWN);
if ( asp_shutdown( asp ) < 0 ) {
- LOG(log_error, logtype_default, "afp_die: asp_shutdown: %s", strerror(errno) );
+ 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 ) {
- LOG(log_error, logtype_default, "afp_timedown: setitimer: %s", strerror(errno) );
+ 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 ) {
- LOG(log_error, logtype_default, "afp_timedown: sigaction: %s", strerror(errno) );
+ 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 ) {
- LOG(log_error, logtype_default, "afp_over_asp: sigaction: %s", strerror(errno) );
+ 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 ) {
- LOG(log_error, logtype_default, "afp_over_asp: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_over_asp: sigaction: %s", strerror(errno) );
afp_asp_die(1);
}
- LOG(log_info, logtype_default, "session from %u.%u:%u on %u.%u:%u",
+ 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 ),
switch (reply) {
case ASPFUNC_CLOSE :
afp_asp_close(obj);
- LOG(log_info, logtype_default, "done" );
+ LOG(log_info, logtype_afpd, "done" );
if ( obj->options.flags & OPTION_DEBUG ) {
printf( "done\n" );
#ifdef AFS
if ( writtenfork ) {
if ( flushfork( writtenfork ) < 0 ) {
- LOG(log_error, logtype_default, "main flushfork: %s",
+ LOG(log_error, logtype_afpd, "main flushfork: %s",
strerror(errno));
}
writtenfork = NULL;
asp->commands, asp->cmdlen,
asp->data, &asp->datalen);
} else {
- LOG(log_error, logtype_default, "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 ) {
- LOG(log_error, logtype_default, "asp_cmdreply: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "asp_cmdreply: %s", strerror(errno) );
afp_asp_die(1);
}
break;
asp->commands, asp->cmdlen,
asp->data, &asp->datalen);
} else {
- LOG(log_error, logtype_default, "(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 ) {
- LOG(log_error, logtype_default, "asp_wrtreply: %s", strerror(errno) );
+ 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.
*/
- LOG(log_info, logtype_default, "main: asp_getrequest: %d", reply );
+ LOG(log_info, logtype_afpd, "main: asp_getrequest: %d", reply );
break;
}
/*
- * $Id: afp_config.c,v 1.16 2002-02-13 15:09:40 jmarcus Exp $
+ * $Id: afp_config.c,v 1.17 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
SLPHandle hslp;
err = SLPOpen("en", SLP_FALSE, &hslp);
if (err != SLP_OK) {
- LOG(log_error, logtype_default, "dsi_cleanup: Error opening SRVLOC handle");
+ LOG(log_error, logtype_afpd, "dsi_cleanup: Error opening SRVLOC handle");
goto srvloc_dereg_err;
}
SRVLOC_callback,
&callbackerr);
if (err != SLP_OK) {
- LOG(log_error, logtype_default, "dsi_cleanup: Error unregistering %s from SRVLOC", srvloc_url);
+ LOG(log_error, logtype_afpd, "dsi_cleanup: Error unregistering %s from SRVLOC", srvloc_url);
goto srvloc_dereg_err;
}
if (callbackerr != SLP_OK) {
- LOG(log_error, logtype_default, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", srvloc_url, callbackerr);
+ LOG(log_error, logtype_afpd, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", srvloc_url, callbackerr);
goto srvloc_dereg_err;
}
if (!(asp = asp_getsession(config->obj.handle, server_children,
config->obj.options.tickleval))) {
- LOG(log_error, logtype_default, "main: asp_getsession: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: asp_getsession: %s", strerror(errno) );
exit( 1 );
}
if (!(dsi = dsi_getsession(config->obj.handle, server_children,
config->obj.options.tickleval))) {
- LOG(log_error, logtype_default, "main: dsi_getsession: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: dsi_getsession: %s", strerror(errno) );
exit( 1 );
}
return NULL;
if ((atp = atp_open(ATADDR_ANYPORT, &options->ddpaddr)) == NULL) {
- LOG(log_error, logtype_default, "main: atp_open: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: atp_open: %s", strerror(errno) );
free(config);
return NULL;
}
if ((asp = asp_init( atp )) == NULL) {
- LOG(log_error, logtype_default, "main: asp_init: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: asp_init: %s", strerror(errno) );
atp_close(atp);
free(config);
return NULL;
/* register asp server */
Obj = (char *) options->hostname;
if (nbp_name(options->server, &Obj, &Type, &Zone )) {
- LOG(log_error, logtype_default, "main: can't parse %s", options->server );
+ LOG(log_error, logtype_afpd, "main: can't parse %s", options->server );
goto serv_free_return;
}
/* make sure we're not registered */
nbp_unrgstr(Obj, Type, Zone, &options->ddpaddr);
if (nbp_rgstr( atp_sockaddr( atp ), Obj, Type, Zone ) < 0 ) {
- LOG(log_error, logtype_default, "Can't register %s:%s@%s", Obj, Type, Zone );
+ LOG(log_error, logtype_afpd, "Can't register %s:%s@%s", Obj, Type, Zone );
free(config->obj.Obj);
free(config->obj.Type);
free(config->obj.Zone);
goto serv_free_return;
}
- LOG(log_info, logtype_default, "%s:%s@%s started on %u.%u:%u (%s)", Obj, Type, Zone,
+ LOG(log_info, logtype_afpd, "%s:%s@%s started on %u.%u:%u (%s)", Obj, Type, Zone,
ntohs( atp_sockaddr( atp )->sat_addr.s_net ),
atp_sockaddr( atp )->sat_addr.s_node,
atp_sockaddr( atp )->sat_port, VERSION );
#endif /* USE_SRVLOC */
if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) {
- LOG(log_error, logtype_default, "DSIConfigInit: malloc(config): %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "DSIConfigInit: malloc(config): %s", strerror(errno) );
return NULL;
}
options->ipaddr, options->port,
options->flags & OPTION_PROXY,
options->server_quantum)) == NULL) {
- LOG(log_error, logtype_default, "main: dsi_init: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: dsi_init: %s", strerror(errno) );
free(config);
return NULL;
}
if (options->flags & OPTION_PROXY) {
- LOG(log_info, logtype_default, "ASIP proxy initialized for %s:%d (%s)",
+ LOG(log_info, logtype_afpd, "ASIP proxy initialized for %s:%d (%s)",
inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port),
VERSION);
} else {
- LOG(log_info, logtype_default, "ASIP started on %s:%d(%d) (%s)",
+ LOG(log_info, logtype_afpd, "ASIP started on %s:%d(%d) (%s)",
inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port),
dsi->serversock, VERSION);
}
#ifdef USE_SRVLOC
err = SLPOpen("en", SLP_FALSE, &hslp);
if (err != SLP_OK) {
- LOG(log_error, logtype_default, "DSIConfigInit: Error opening SRVLOC handle");
+ LOG(log_error, logtype_afpd, "DSIConfigInit: Error opening SRVLOC handle");
goto srvloc_reg_err;
}
afp_port = afpovertcp->s_port;
}
if (strlen(options->hostname) > (sizeof(srvloc_url) - strlen(inet_ntoa(dsi->server.sin_addr)) - 21)) {
- LOG(log_error, logtype_default, "DSIConfigInit: Hostname is too long for SRVLOC");
+ LOG(log_error, logtype_afpd, "DSIConfigInit: Hostname is too long for SRVLOC");
goto srvloc_reg_err;
}
if (dsi->server.sin_port == afp_port) {
SRVLOC_callback,
&callbackerr);
if (err != SLP_OK) {
- LOG(log_error, logtype_default, "DSIConfigInit: Error registering %s with SRVLOC", srvloc_url);
+ LOG(log_error, logtype_afpd, "DSIConfigInit: Error registering %s with SRVLOC", srvloc_url);
goto srvloc_reg_err;
}
if (callbackerr != SLP_OK) {
- LOG(log_error, logtype_default, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", srvloc_url);
+ LOG(log_error, logtype_afpd, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", srvloc_url);
goto srvloc_reg_err;
}
- LOG(log_info, logtype_default, "Sucessfully registered %s with SRVLOC", srvloc_url);
+ LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", srvloc_url);
srvloc_reg_err:
SLPClose(hslp);
if ((refcount = (unsigned char *)
calloc(1, sizeof(unsigned char))) == NULL) {
- LOG(log_error, logtype_default, "AFPConfigInit: calloc(refcount): %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "AFPConfigInit: calloc(refcount): %s", strerror(errno) );
return NULL;
}
/*
- * $Id: afp_dsi.c,v 1.19 2002-03-16 20:38:09 jmarcus Exp $
+ * $Id: afp_dsi.c,v 1.20 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
* Copyright (c) 1990,1993 Regents of The University of Michigan.
/* UAM had syslog control; afpd needs to reassert itself */
set_processname("afpd");
syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid, logfacility_daemon);
- LOG(log_info, logtype_default, "%.2fKB read, %.2fKB written",
+ LOG(log_info, logtype_afpd, "%.2fKB read, %.2fKB written",
dsi->read_count/1024.0, dsi->write_count/1024.0);
dsi_close(dsi);
afp_dsi_close(child.obj);
if (sig) /* if no signal, assume dieing because logins are disabled &
don't log it (maintenance mode)*/
- LOG(log_info, logtype_default, "Connection terminated");
+ LOG(log_info, logtype_afpd, "Connection terminated");
if (sig == SIGTERM || sig == SIGALRM) {
exit( 0 );
}
it.it_value.tv_sec = 300;
it.it_value.tv_usec = 0;
if ( setitimer( ITIMER_REAL, &it, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "afp_timedown: setitimer: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_timedown: setitimer: %s", strerror(errno) );
afp_dsi_die(1);
}
sigaddset(&sv.sa_mask, SIGTERM);
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGALRM, &sv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "afp_timedown: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_timedown: sigaction: %s", strerror(errno) );
afp_dsi_die(1);
}
}
if ((child.flags & CHILD_RUNNING) || (child.tickle++ < child.obj->options.timeout)) {
dsi_tickle(child.obj->handle);
} else { /* didn't receive a tickle. close connection */
- LOG(log_error, logtype_default, "afp_alarm: child timed out");
+ LOG(log_error, logtype_afpd, "afp_alarm: child timed out");
afp_dsi_die(1);
}
}
sigaddset(&action.sa_mask, SIGTERM);
action.sa_flags = SA_RESTART;
if ( sigaction( SIGHUP, &action, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) );
afp_dsi_die(1);
}
sigaddset(&action.sa_mask, SIGHUP);
action.sa_flags = SA_RESTART;
if ( sigaction( SIGTERM, &action, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) );
afp_dsi_die(1);
}
sigaddset(&action.sa_mask, SIGUSR2);
action.sa_flags = SA_RESTART;
if ( sigaction( SIGUSR2, &action, 0) < 0 ) {
- LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) );
afp_dsi_die(1);
}
#endif /* SERVERTEXT */
switch(cmd) {
case DSIFUNC_CLOSE:
afp_dsi_close(obj);
- LOG(log_info, logtype_default, "done");
+ LOG(log_info, logtype_afpd, "done");
if (obj->options.flags & OPTION_DEBUG )
printf("done\n");
return;
#ifdef AFS
if ( writtenfork ) {
if ( flushfork( writtenfork ) < 0 ) {
- LOG(log_error, logtype_default, "main flushfork: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main flushfork: %s", strerror(errno) );
}
writtenfork = NULL;
}
dsi->data, &dsi->datalen);
child.flags &= ~CHILD_RUNNING;
} else {
- LOG(log_error, logtype_default, "bad function %X", function);
+ LOG(log_error, logtype_afpd, "bad function %X", function);
dsi->datalen = 0;
err = AFPERR_NOOP;
}
}
if (!dsi_cmdreply(dsi, err)) {
- LOG(log_error, logtype_default, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) );
+ LOG(log_error, logtype_afpd, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) );
afp_dsi_die(1);
}
break;
dsi->data, &dsi->datalen);
child.flags &= ~CHILD_RUNNING;
} else {
- LOG(log_error, logtype_default, "(write) bad function %x", function);
+ LOG(log_error, logtype_afpd, "(write) bad function %x", function);
dsi->datalen = 0;
err = AFPERR_NOOP;
}
}
if (!dsi_wrtreply(dsi, err)) {
- LOG(log_error, logtype_default, "dsi_wrtreply: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "dsi_wrtreply: %s", strerror(errno) );
afp_dsi_die(1);
}
break;
* between server and client. if things are correct,
* we need to flush the rest of the packet if necessary. */
default:
- LOG(log_info, logtype_default,"afp_dsi: spurious command %d", cmd);
+ LOG(log_info, logtype_afpd,"afp_dsi: spurious command %d", cmd);
dsi_writeinit(dsi, dsi->data, DSI_DATASIZ);
dsi_writeflush(dsi);
break;
/*
- * $Id: afp_options.c,v 1.20 2002-02-16 11:04:50 srittau Exp $
+ * $Id: afp_options.c,v 1.21 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* Copyright (c) 1990,1993 Regents of The University of Michigan.
struct in_addr inaddr;
if (inet_aton(c, &inaddr) && (opt = strdup(c))) {
if (!gethostbyaddr((const char *) &inaddr, sizeof(inaddr), AF_INET))
- LOG(log_info, logtype_default, "WARNING: can't find %s\n", opt);
+ LOG(log_info, logtype_afpd, "WARNING: can't find %s\n", opt);
options->ipaddr = opt;
}
}
/*
- * $Id: afs.c,v 1.9 2002-01-19 21:29:55 jmarcus Exp $
+ * $Id: afs.c,v 1.10 2002-03-24 01:23:40 sibaz Exp $
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
ucase( realm );
if ( *realm == '\0' ) {
if ( krb_get_lrealm( realm, 1 ) != KSUCCESS ) {
- LOG(log_error, logtype_default, "krb_get_lrealm failed" );
+ LOG(log_error, logtype_afpd, "krb_get_lrealm failed" );
return( AFPERR_BADUAM );
}
}
ibuf += len;
newpw[ len ] = '\0';
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_afpd,
"changing password for <%s>.<%s>@<%s>", name, instance, realm );
ka_StringToKey( oldpw, realm, &oldkey );
return( AFPERR_BADUAM );
}
- LOG(log_debug, logtype_default, "password changed succeeded" );
+ LOG(log_debug, logtype_afpd, "password changed succeeded" );
return( AFP_OK );
}
/*
- * $Id: auth.c,v 1.26 2002-03-20 20:53:57 morgana Exp $
+ * $Id: auth.c,v 1.27 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*data++ = num;
while ((uams = uams->uam_prev) != &uam_login) {
if (strstr(authlist, uams->uam_path)) {
- LOG(log_info, logtype_default, "uam: \"%s\" available", uams->uam_name);
+ LOG(log_info, logtype_afpd, "uam: \"%s\" available", uams->uam_name);
len = strlen( uams->uam_name);
*data++ = len;
memcpy( data, uams->uam_name, len );
syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_daemon);
if ( pwd->pw_uid == 0 ) { /* don't allow root login */
- LOG(log_error, logtype_default, "login: root login denied!" );
+ LOG(log_error, logtype_afpd, "login: root login denied!" );
return AFPERR_NOTAUTH;
}
- LOG(log_info, logtype_default, "login %s (uid %d, gid %d) %s", pwd->pw_name,
+ LOG(log_info, logtype_afpd, "login %s (uid %d, gid %d) %s", pwd->pw_name,
pwd->pw_uid, pwd->pw_gid , afp_versions[afp_version_index]);
if (obj->proto == AFPPROTO_ASP) {
sprintf(nodename, "%s/net%d.%dnode%d", obj->options.authprintdir,
addr_net / 256, addr_net % 256, addr_node);
- LOG(log_info, logtype_default, "registering %s (uid %d) on %u.%u as %s",
+ 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);
if (stat(nodename, &stat_buf) == 0) { /* file exists */
fclose(fp);
chown( nodename, pwd->pw_uid, -1 );
} else { /* somebody is messing with us */
- LOG(log_error, logtype_default, "print authfile %s is not a normal file, it will not be modified", nodename );
+ LOG(log_error, logtype_afpd, "print authfile %s is not a normal file, it will not be modified", nodename );
}
} else { /* file 'nodename' does not exist */
fp = fopen(nodename, "w");
if (initgroups( pwd->pw_name, pwd->pw_gid ) < 0) {
#ifdef RUN_AS_USER
- LOG(log_info, logtype_default, "running with uid %d", geteuid());
+ LOG(log_info, logtype_afpd, "running with uid %d", geteuid());
#else /* RUN_AS_USER */
- LOG(log_error, logtype_default, "login: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "login: %s", strerror(errno));
return AFPERR_BADUAM;
#endif /* RUN_AS_USER */
/* Basically if the user is in the admin group, we stay root */
if (( ngroups = getgroups( NGROUPS, groups )) < 0 ) {
- LOG(log_error, logtype_default, "login: getgroups: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "login: getgroups: %s", strerror(errno) );
return AFPERR_BADUAM;
}
#ifdef ADMIN_GRP
#ifdef DEBUG
- LOG(log_info, logtype_default, "obj->options.admingid == %d", obj->options.admingid);
+ LOG(log_info, logtype_afpd, "obj->options.admingid == %d", obj->options.admingid);
#endif /* DEBUG */
if (obj->options.admingid != 0) {
int i;
if (groups[i] == obj->options.admingid) admin = 1;
}
}
- if (admin) LOG(log_info, logtype_default, "admin login -- %s", pwd->pw_name );
+ if (admin) LOG(log_info, logtype_afpd, "admin login -- %s", pwd->pw_name );
if (!admin)
#endif /* DEBUG */
#ifdef TRU64
SIA_BEU_REALLOGIN ) != SIASUCCESS )
return AFPERR_BADUAM;
- LOG(log_info, logtype_default, "session from %s (%s)", hostname,
+ LOG(log_info, logtype_afpd, "session from %s (%s)", hostname,
inet_ntoa( dsi->client.sin_addr ) );
if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) {
- LOG(log_error, logtype_default, "login: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "login: %s", strerror(errno) );
return AFPERR_BADUAM;
}
}
#else /* TRU64 */
if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) {
- LOG(log_error, logtype_default, "login: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "login: %s", strerror(errno) );
return AFPERR_BADUAM;
}
#endif /* TRU64 */
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- LOG(log_info, logtype_default, "logout %s", obj->username);
+ LOG(log_info, logtype_afpd, "logout %s", obj->username);
obj->exit(0);
return AFP_OK;
}
if ((len + 1) & 1) /* pad byte */
ibuf++;
- LOG(log_info, logtype_default, "changing password for <%s>", username);
+ LOG(log_info, logtype_afpd, "changing password for <%s>", username);
if (( pwd = uam_getname( username, sizeof(username))) == NULL )
return AFPERR_PARAM;
ibuflen -= (ibuf - start);
len = uam->u.uam_changepw(obj, username, pwd, ibuf, ibuflen,
rbuf, rbuflen);
- LOG(log_info, logtype_default, "password change %s.",
+ LOG(log_info, logtype_afpd, "password change %s.",
(len == AFPERR_AUTHCONT) ? "continued" :
(len ? "failed" : "succeeded"));
return len;
while (p) {
strncpy(name + len, p, sizeof(name) - len);
- LOG(log_debug, logtype_default, "uam: loading (%s)", name);
+ LOG(log_debug, logtype_afpd, "uam: loading (%s)", name);
/*
if ((stat(name, &st) == 0) && (mod = uam_load(name, p))) {
*/
if (stat(name, &st) == 0) {
if ((mod = uam_load(name, p))) {
uam_attach(&uam_modules, mod);
- LOG(log_info, logtype_default, "uam: %s loaded", p);
+ LOG(log_info, logtype_afpd, "uam: %s loaded", p);
} else {
- LOG(log_info, logtype_default, "uam: %s load failure",p);
+ LOG(log_info, logtype_afpd, "uam: %s load failure",p);
}
} else {
- LOG(log_info, logtype_default, "uam: uam not found (status=%d)", stat(name, &st));
+ LOG(log_info, logtype_afpd, "uam: uam not found (status=%d)", stat(name, &st));
}
p = strtok(NULL, ",");
}
/*
- * $Id: codepage.c,v 1.7 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: codepage.c,v 1.8 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 2000 Adrian Sun
* All Rights Reserved. See COPYRIGHT.
int fd, i, quantum, rules;
if ((fd = open(path, O_RDONLY)) < 0) {
- LOG(log_error, logtype_default, "%s: failed to open codepage", path);
+ LOG(log_error, logtype_afpd, "%s: failed to open codepage", path);
return -1;
}
/* Read the codepage file header. */
if(read(fd, buf, sizeof(buf)) != sizeof(buf)) {
- LOG(log_error, logtype_default, "%s: failed to read codepage header", path);
+ LOG(log_error, logtype_afpd, "%s: failed to read codepage header", path);
goto codepage_fail;
}
cur += sizeof(id);
id = ntohs(id);
if (id != CODEPAGE_FILE_ID) {
- LOG(log_error, logtype_default, "%s: not a codepage", path);
+ LOG(log_error, logtype_afpd, "%s: not a codepage", path);
goto codepage_fail;
}
/* check the version number */
if (*cur++ != CODEPAGE_FILE_VERSION) {
- LOG(log_error, logtype_default, "%s: codepage version not supported", path);
+ LOG(log_error, logtype_afpd, "%s: codepage version not supported", path);
goto codepage_fail;
}
rules = *cur++;
if (codepage_init(vol, rules, quantum) < 0) {
- LOG(log_error, logtype_default, "%s: Unable to allocate memory", path);
+ LOG(log_error, logtype_afpd, "%s: Unable to allocate memory", path);
goto codepage_fail;
}
while (read(fd, buf, i) == i) {
if (*buf & CODEPAGE_RULE_MTOU) {
if (add_code(vol->v_mtoupage, buf + 1, buf + 1 + quantum) < 0) {
- LOG(log_error, logtype_default, "unable to allocate memory for mtoupage");
+ LOG(log_error, logtype_afpd, "unable to allocate memory for mtoupage");
break;
}
}
if (*buf & CODEPAGE_RULE_UTOM) {
if (add_code(vol->v_utompage, buf + 1 + quantum, buf + 1) < 0) {
- LOG(log_error, logtype_default, "unable to allocate memory for utompage");
+ LOG(log_error, logtype_afpd, "unable to allocate memory for utompage");
break;
}
}
/*
- * $Id: desktop.c,v 1.11 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: desktop.c,v 1.12 2002-03-24 01:23:40 sibaz Exp $
*
* See COPYRIGHT.
*/
*adts = '/';
if (( si.sdt_fd = open( dtf, flags, ad_mode( dtf, mode ))) < 0 ) {
- LOG(log_error, logtype_default, "iconopen: open %s: %s", dtf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "iconopen: open %s: %s", dtf, strerror(errno) );
return -1;
}
} else {
if (lseek( si.sdt_fd, (off_t) 0L, SEEK_SET ) < 0) {
close(si.sdt_fd);
si.sdt_fd = -1;
- LOG(log_error, logtype_default, "afp_addicon: lseek: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_addicon: lseek: %s", strerror(errno) );
cc = AFPERR_PARAM;
goto addicon_err;
}
}
if ( lseek( si.sdt_fd, (off_t) rsize, SEEK_CUR ) < 0 ) {
- LOG(log_error, logtype_default, "afp_addicon: lseek: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_addicon: lseek: %s", strerror(errno) );
cc = AFPERR_PARAM;
}
}
*/
addicon_err:
if ( cc < 0 ) {
- LOG(log_error, logtype_default, "afp_addicon: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_addicon: %s", strerror(errno) );
if (obj->proto == AFPPROTO_DSI) {
dsi_writeinit(obj->handle, rbuf, buflen);
dsi_writeflush(obj->handle);
}
if ( writev( si.sdt_fd, iov, iovcnt ) < 0 ) {
- LOG(log_error, logtype_default, "afp_addicon: writev: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_addicon: writev: %s", strerror(errno) );
return( AFPERR_PARAM );
}
break;
/* add headers at end of file */
if ((cc == 0) && (write(si.sdt_fd, imh, sizeof(imh)) < 0)) {
- LOG(log_error, logtype_default, "afp_addicon: write: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_addicon: write: %s", strerror(errno));
dsi_writeflush(dsi);
return AFPERR_PARAM;
}
if ((cc = write(si.sdt_fd, rbuf, iovcnt)) < 0) {
- LOG(log_error, logtype_default, "afp_addicon: write: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_addicon: write: %s", strerror(errno));
dsi_writeflush(dsi);
return AFPERR_PARAM;
}
}
if ((cc = write(si.sdt_fd, rbuf, iovcnt)) < 0) {
- LOG(log_error, logtype_default, "afp_addicon: write: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_addicon: write: %s", strerror(errno));
dsi_writeflush(dsi);
return AFPERR_PARAM;
}
memcpy( &bsize, ih + 10, sizeof( bsize ));
bsize = ntohs(bsize);
if ( lseek( si.sdt_fd, (off_t) bsize, SEEK_CUR ) < 0 ) {
- LOG(log_error, logtype_default, "afp_iconinfo: lseek: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_iconinfo: lseek: %s", strerror(errno) );
return( AFPERR_PARAM );
}
if ( si.sdt_index == iindex ) {
if ( lseek( si.sdt_fd, (off_t) 0L, SEEK_SET ) < 0 ) {
close(si.sdt_fd);
si.sdt_fd = -1;
- LOG(log_error, logtype_default, "afp_geticon: lseek: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_geticon: lseek: %s", strerror(errno));
return( AFPERR_PARAM );
}
memcpy( &rsize, ih + 10, sizeof( rsize ));
rsize = ntohs( rsize );
if ( lseek( si.sdt_fd, (off_t) rsize, SEEK_CUR ) < 0 ) {
- LOG(log_error, logtype_default, "afp_geticon: lseek: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_geticon: lseek: %s", strerror(errno) );
return( AFPERR_PARAM );
}
offset += rsize;
}
if ( rc < 0 ) {
- LOG(log_error, logtype_default, "afp_geticon: read: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_geticon: read: %s", strerror(errno));
return( AFPERR_PARAM );
}
return AFP_OK;
geticon_exit:
- LOG(log_info, logtype_default, "afp_geticon: %s", strerror(errno));
+ LOG(log_info, logtype_afpd, "afp_geticon: %s", strerror(errno));
dsi_readdone(dsi);
obj->exit(1);
return AFP_OK;
/*
- * $Id: directory.c,v 1.27 2002-03-13 19:29:14 srittau Exp $
+ * $Id: directory.c,v 1.28 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
goto setdirparam_done;
break;
default :
- LOG(log_error, logtype_default, "setdirparam: setdeskowner: %s",
+ LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %s",
strerror(errno) );
if (!isad) {
err = AFPERR_PARAM;
goto setdirparam_done;
break;
default :
- LOG(log_error, logtype_default, "setdirparam: setdirowner: %s",
+ LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
strerror(errno) );
break;
}
goto setdirparam_done;
break;
default :
- LOG(log_error, logtype_default, "setdirparam: setdeskowner: %m" );
+ LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %m" );
if (!isad) {
err = AFPERR_PARAM;
goto setdirparam_done;
goto setdirparam_done;
break;
default :
- LOG(log_error, logtype_default, "setdirparam: setdirowner: %s",
+ LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
strerror(errno) );
break;
}
err = AFPERR_VLOCK;
goto setdirparam_done;
default :
- LOG(log_error, logtype_default, "setdirparam: setdeskmode: %s",
+ LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s",
strerror(errno) );
break;
err = AFPERR_PARAM;
err = AFPERR_VLOCK;
goto setdirparam_done;
default :
- LOG(log_error, logtype_default, "setdirparam: setdirmode: %s",
+ LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s",
strerror(errno) );
err = AFPERR_PARAM;
goto setdirparam_done;
renamedir_done:
if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "renamedir: realloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "renamedir: realloc: %s", strerror(errno) );
return AFPERR_MISC;
}
dir->d_name = buf;
/*
- * $Id: enumerate.c,v 1.17 2002-02-02 19:11:34 jmarcus Exp $
+ * $Id: enumerate.c,v 1.18 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#endif /* USE_LASTDID */
if ((cdir = dirnew(namlen + 1)) == NULL) {
- LOG(log_error, logtype_default, "adddir: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "adddir: malloc: %s", strerror(errno) );
return NULL;
}
strcpy( cdir->d_name, name );
if (cdir->d_did == CNID_INVALID) {
switch (errno) {
case CNID_ERR_PARAM:
- LOG(log_error, logtype_default, "adddir: Incorrect parameters passed to cnid_add");
+ LOG(log_error, logtype_afpd, "adddir: Incorrect parameters passed to cnid_add");
return NULL;
case CNID_ERR_PATH:
case CNID_ERR_DB:
#ifndef CNID_DB
if (edir->d_name) {
if (strcmp(edir->d_name, cdir->d_name)) {
- LOG(log_info, logtype_default, "WARNING: DID conflict for '%s' and '%s'. Are these the same file?", edir->d_name, cdir->d_name);
+ LOG(log_info, logtype_afpd, "WARNING: DID conflict for '%s' and '%s'. Are these the same file?", edir->d_name, cdir->d_name);
}
free(cdir->d_name);
free(cdir);
if ( sd.sd_buflen == 0 ) {
if (( sd.sd_buf = (char *)malloc( SDBUFBRK )) == NULL ) {
- LOG(log_error, logtype_default, "afp_enumerate: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_enumerate: malloc: %s", strerror(errno) );
*rbuflen = 0;
return AFPERR_MISC;
}
start = sd.sd_buf;
if ((buf = (char *) realloc( sd.sd_buf, sd.sd_buflen +
SDBUFBRK )) == NULL ) {
- LOG(log_error, logtype_default, "afp_enumerate: realloc: %s",
+ LOG(log_error, logtype_afpd, "afp_enumerate: realloc: %s",
strerror(errno) );
closedir(dp);
*rbuflen = 0;
sd.sd_last++;
if ( stat( sd.sd_last, &st ) < 0 ) {
- LOG(log_debug, logtype_default, "afp_enumerate: stat %s: %s",
+ LOG(log_debug, logtype_afpd, "afp_enumerate: stat %s: %s",
sd.sd_last, strerror(errno) );
sd.sd_last += len + 1;
continue;
/*
- * $Id: file.c,v 1.41 2002-03-13 19:29:17 srittau Exp $
+ * $Id: file.c,v 1.42 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
u_char achar, fdType[4];
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin getfilparams:");
+ LOG(log_info, logtype_afpd, "begin getfilparams:");
#endif /* DEBUG */
upath = mtoupath(vol, path);
if ( ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, adp) < 0 ) {
isad = 0;
} else if ( fstat( ad_hfileno( adp ), &hst ) < 0 ) {
- LOG(log_error, logtype_default, "getfilparams fstat: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "getfilparams fstat: %s", strerror(errno) );
}
data = buf;
if (aint == CNID_INVALID) {
switch (errno) {
case CNID_ERR_PARAM:
- LOG(log_error, logtype_default, "getfilparams: Incorrect parameters passed to cnid_add");
+ LOG(log_error, logtype_afpd, "getfilparams: Incorrect parameters passed to cnid_add");
return(AFPERR_PARAM);
case CNID_ERR_PATH:
return(AFPERR_PARAM);
*buflen = data - buf;
#ifdef DEBUG
- LOG(log_info, logtype_default, "end getfilparams:");
+ LOG(log_info, logtype_afpd, "end getfilparams:");
#endif /* DEBUG */
return( AFP_OK );
#endif /* FORCE_UIDGID */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_createfile:");
+ LOG(log_info, logtype_afpd, "begin afp_createfile:");
#endif /* DEBUG */
*rbuflen = 0;
setvoltime(obj, vol );
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_createfile");
+ LOG(log_info, logtype_afpd, "end afp_createfile");
#endif /* DEBUG */
#ifdef FORCE_UIDGID
u_int16_t vid, bitmap;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_setfilparams:");
+ LOG(log_info, logtype_afpd, "begin afp_setfilparams:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_setfilparams:");
+ LOG(log_info, logtype_afpd, "end afp_setfilparams:");
#endif /* DEBUG */
return( rc );
#endif /* FORCE_UIDGID */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin setfilparams:");
+ LOG(log_info, logtype_afpd, "begin setfilparams:");
#endif /* DEBUG */
upath = mtoupath(vol, path);
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end setfilparams:");
+ LOG(log_info, logtype_afpd, "end setfilparams:");
#endif /* DEBUG */
return err;
/* existence check moved to afp_moveandrename */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin renamefile:");
+ LOG(log_info, logtype_afpd, "begin renamefile:");
#endif /* DEBUG */
if ( rename( src, dst ) < 0 ) {
ad_close( &ad, ADFLAGS_HF );
#ifdef DEBUG
- LOG(log_info, logtype_default, "end renamefile:");
+ LOG(log_info, logtype_afpd, "end renamefile:");
#endif /* DEBUG */
return( AFP_OK );
u_int16_t svid, dvid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_copyfile:");
+ LOG(log_info, logtype_afpd, "begin afp_copyfile:");
#endif /* DEBUG */
*rbuflen = 0;
#endif /* DROPKLUDGE */
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_copyfile:");
+ LOG(log_info, logtype_afpd, "end afp_copyfile:");
#endif /* DEBUG */
return( retvalue );
ssize_t cc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin copy_all:");
+ LOG(log_info, logtype_afpd, "begin copy_all:");
#endif /* DEBUG */
while (buflen > 0) {
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end copy_all:");
+ LOG(log_info, logtype_afpd, "end copy_all:");
#endif /* DEBUG */
return AFP_OK;
ssize_t cc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin copyfile:");
+ LOG(log_info, logtype_afpd, "begin copyfile:");
#endif /* DEBUG */
if (newname) {
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end copyfile:");
+ LOG(log_info, logtype_afpd, "end copyfile:");
#endif /* DEBUG */
return( AFP_OK );
int openmode = O_RDWR;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin deletefile:");
+ LOG(log_info, logtype_afpd, "begin deletefile:");
#endif /* DEBUG */
while(1) {
ad_close( &ad, adflags );
#ifdef DEBUG
- LOG(log_info, logtype_default, "end deletefile:");
+ LOG(log_info, logtype_afpd, "end deletefile:");
#endif /* DEBUG */
return err;
u_short vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_createid:");
+ LOG(log_info, logtype_afpd, "begin afp_createid:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "ending afp_createid...:");
+ LOG(log_info, logtype_afpd, "ending afp_createid...:");
#endif /* DEBUG */
switch (errno) {
return AFPERR_ACCESS;
break;
default:
- LOG(log_error, logtype_default, "afp_createid: cnid_add: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_createid: cnid_add: %s", strerror(errno));
return AFPERR_PARAM;
}
}
u_int16_t vid, bitmap;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_resolveid:");
+ LOG(log_info, logtype_afpd, "begin afp_resolveid:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(rbuf, ibuf, sizeof(bitmap));
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_resolveid:");
+ LOG(log_info, logtype_afpd, "end afp_resolveid:");
#endif /* DEBUG */
return AFP_OK;
u_short vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_deleteid:");
+ LOG(log_info, logtype_afpd, "begin afp_deleteid:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_deleteid:");
+ LOG(log_info, logtype_afpd, "end afp_deleteid:");
#endif /* DEBUG */
return err;
u_int16_t vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_exchangefiles:");
+ LOG(log_info, logtype_afpd, "begin afp_exchangefiles:");
#endif /* DEBUG */
*rbuflen = 0;
#endif /* CNID_DB */
#ifdef DEBUG
- LOG(log_info, logtype_default, "ending afp_exchangefiles:");
+ LOG(log_info, logtype_afpd, "ending afp_exchangefiles:");
#endif /* DEBUG */
return AFP_OK;
/*
- * $Id: filedir.c,v 1.24 2002-03-13 19:29:17 srittau Exp $
+ * $Id: filedir.c,v 1.25 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
int uid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin matchfile2dirperms:");
+ LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
#endif /* DEBUG */
if (stat(upath, &st ) < 0)
- LOG(log_error, logtype_default, "Could not stat %s: %s", upath, strerror(errno));
+ LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno));
strcpy (adpath, "./.AppleDouble/");
strcat (adpath, upath);
if (( dir = dirsearch( vol, did )) == NULL ) {
- LOG(log_error, logtype_default, "matchfile2dirperms: Unable to get directory info.");
+ LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info.");
return( AFPERR_NOOBJ );
}
else if (stat(".", &sb) < 0) {
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error checking directory \"%s\": %s",
dir->d_name, strerror(errno));
return(AFPERR_NOOBJ );
seteuid(0);
if (lchown(upath, sb.st_uid, sb.st_gid) < 0)
{
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error changing owner/gid of %s: %s",
upath, strerror(errno));
return (AFPERR_ACCESS);
}
if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
{
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error adding file read permissions: %s",
strerror(errno));
return (AFPERR_ACCESS);
}
#ifdef DEBUG
else
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_afpd,
"matchfile2dirperms: Added S_IRGRP and S_IROTH: %s",
strerror(errno));
#endif /* DEBUG */
if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
{
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
adpath, strerror(errno));
return (AFPERR_ACCESS);
}
if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
{
- LOG(log_error, logtype_default,
+ LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error adding AD file read permissions: %s",
strerror(errno));
return (AFPERR_ACCESS);
}
#ifdef DEBUG
else
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_afpd,
"matchfile2dirperms: Added S_IRGRP and S_IROTH to AD: %s",
strerror(errno));
#endif /* DEBUG */
}
#ifdef DEBUG
else
- LOG(log_info, logtype_default,
+ LOG(log_info, logtype_afpd,
"matchfile2dirperms: No ownership change necessary.");
#endif /* DEBUG */
} /* end else if stat success */
seteuid(uid); /* Restore process ownership to normal */
#ifdef DEBUG
- LOG(log_info, logtype_default, "end matchfile2dirperms:");
+ LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
#endif /* DEBUG */
return (AFP_OK);
u_int16_t fbitmap, dbitmap, vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_getfildirparams:");
+ LOG(log_info, logtype_afpd, "begin afp_getfildirparams:");
#endif /* DEBUG */
*rbuflen = 0;
*rbuf = 0;
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_getfildirparams:");
+ LOG(log_info, logtype_afpd, "end afp_getfildirparams:");
#endif /* DEBUG */
return( AFP_OK );
int did, rc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_setfildirparams:");
+ LOG(log_info, logtype_afpd, "begin afp_setfildirparams:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_setfildirparams:");
+ LOG(log_info, logtype_afpd, "end afp_setfildirparams:");
#endif /* DEBUG */
return( rc );
#endif /* CNID_DB */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_rename:");
+ LOG(log_info, logtype_afpd, "begin afp_rename:");
#endif /* DEBUG */
*rbuflen = 0;
isad = 0;
}
if ((buf = realloc( odir->d_name, plen + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "afp_rename: realloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_rename: realloc: %s", strerror(errno) );
if (isad) {
ad_flush(&ad, ADFLAGS_HF); /* in case of create */
ad_close(&ad, ADFLAGS_HF);
return AFPERR_MISC;
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_rename:");
+ LOG(log_info, logtype_afpd, "end afp_rename:");
#endif /* DEBUG */
return( AFP_OK );
u_int16_t vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_delete:");
+ LOG(log_info, logtype_afpd, "begin afp_delete:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_delete:");
+ LOG(log_info, logtype_afpd, "end afp_delete:");
#endif /* DEBUG */
return( rc );
#endif /* DROPKLUDGE */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_moveandrename:");
+ LOG(log_info, logtype_afpd, "begin afp_moveandrename:");
#endif /* DEBUG */
*rbuflen = 0;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_moveandrename:");
+ LOG(log_info, logtype_afpd, "end afp_moveandrename:");
#endif /* DEBUG */
return( rc );
return 0;
/*
#ifdef DEBUG
- LOG(log_debug, logtype_default, "veto_file \"%s\", \"%s\"", veto_str, path);
+ LOG(log_debug, logtype_afpd, "veto_file \"%s\", \"%s\"", veto_str, path);
#endif
*/
for(i=0, j=0; veto_str[i] != '\0'; i++) {
/*
- * $Id: fork.c,v 1.25 2002-03-13 19:28:22 srittau Exp $
+ * $Id: fork.c,v 1.26 2002-03-24 01:23:40 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
} else {
aint = ad_getentrylen( ofork->of_ad, ADEID_RFORK );
if ( ad_refresh( ofork->of_ad ) < 0 ) {
- LOG(log_error, logtype_default, "getforkparams: ad_refresh: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "getforkparams: ad_refresh: %s", strerror(errno) );
return( AFPERR_PARAM );
}
/* See afp_closefork() for why this is bad */
if (aint == CNID_INVALID) {
switch (errno) {
case CNID_ERR_PARAM:
- LOG(log_error, logtype_default, "getforkparams: Incorrect parameters passed to cnid_add");
+ LOG(log_error, logtype_afpd, "getforkparams: Incorrect parameters passed to cnid_add");
return(AFPERR_PARAM);
case CNID_ERR_PATH:
return(AFPERR_PARAM);
goto openfork_err;
break;
default:
- LOG(log_error, logtype_default, "afp_openfork: ad_open: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_openfork: ad_open: %s", strerror(errno) );
ret = AFPERR_PARAM;
goto openfork_err;
break;
goto openfork_err;
break;
default:
- LOG(log_error, logtype_default, "afp_openfork: ad_open: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_openfork: ad_open: %s", strerror(errno) );
goto openfork_err;
break;
}
break;
default:
*rbuflen = 0;
- LOG(log_error, logtype_default, "afp_openfork: ad_lock: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_openfork: ad_lock: %s", strerror(errno) );
return( AFPERR_PARAM );
}
}
*rbuflen = 0;
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_setforkparams: of_find could not locate open fork refnum: %u", ofrefnum );
+ LOG(log_error, logtype_afpd, "afp_setforkparams: of_find could not locate open fork refnum: %u", ofrefnum );
return( AFPERR_PARAM );
}
goto afp_setfork_err;
if (ad_flush( ofork->of_ad, ADFLAGS_HF ) < 0) {
- LOG(log_error, logtype_default, "afp_setforkparams: ad_flush: %s",
+ LOG(log_error, logtype_afpd, "afp_setforkparams: ad_flush: %s",
strerror(errno) );
return( AFPERR_PARAM );
}
#ifdef AFS
if ( flushfork( ofork ) < 0 ) {
- LOG(log_error, logtype_default, "afp_setforkparams: flushfork: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_setforkparams: flushfork: %s", strerror(errno) );
}
#endif /* AFS */
ibuf += sizeof(ofrefnum);
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_bytelock: of_find");
+ LOG(log_error, logtype_afpd, "afp_bytelock: of_find");
return( AFPERR_PARAM );
}
cc = ad_read(ofork->of_ad, eid, offset, rbuf, *rbuflen);
if ( cc < 0 ) {
- LOG(log_error, logtype_default, "afp_read: ad_read: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_read: ad_read: %s", strerror(errno) );
*rbuflen = 0;
return( AFPERR_PARAM );
}
ibuf += sizeof( u_short );
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_read: of_find");
+ LOG(log_error, logtype_afpd, "afp_read: of_find");
err = AFPERR_PARAM;
goto afp_read_err;
}
if (errno == EINVAL)
goto afp_read_loop;
else {
- LOG(log_error, logtype_default, "afp_read: ad_readfile: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_read: ad_readfile: %s", strerror(errno));
goto afp_read_exit;
}
}
goto afp_read_done;
afp_read_exit:
- LOG(log_error, logtype_default, "afp_read: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_read: %s", strerror(errno));
dsi_readdone(dsi);
ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff, savereqcount);
obj->exit(1);
memcpy(&ofrefnum, ibuf, sizeof( ofrefnum ));
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_flushfork: of_find");
+ LOG(log_error, logtype_afpd, "afp_flushfork: of_find");
return( AFPERR_PARAM );
}
if ( flushfork( ofork ) < 0 ) {
- LOG(log_error, logtype_default, "afp_flushfork: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_flushfork: %s", strerror(errno) );
}
return( AFP_OK );
if ( ad_dfileno( ofork->of_ad ) != -1 &&
fsync( ad_dfileno( ofork->of_ad )) < 0 ) {
- LOG(log_error, logtype_default, "flushfork: dfile(%d) %s",
+ LOG(log_error, logtype_afpd, "flushfork: dfile(%d) %s",
ad_dfileno(ofork->of_ad), strerror(errno) );
err = -1;
}
err = -1;
if (err < 0)
- LOG(log_error, logtype_default, "flushfork: hfile(%d) %s",
+ LOG(log_error, logtype_afpd, "flushfork: hfile(%d) %s",
ad_hfileno(ofork->of_ad), strerror(errno) );
}
memcpy(&ofrefnum, ibuf, sizeof( ofrefnum ));
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_closefork: of_find");
+ LOG(log_error, logtype_afpd, "afp_closefork: of_find");
return( AFPERR_PARAM );
}
}
if ( ad_close( ofork->of_ad, adflags ) < 0 ) {
- LOG(log_error, logtype_default, "afp_closefork: ad_close: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_closefork: ad_close: %s", strerror(errno) );
return( AFPERR_PARAM );
}
case ENOSPC :
return( AFPERR_DFULL );
default :
- LOG(log_error, logtype_default, "afp_write: ad_write: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_write: ad_write: %s", strerror(errno) );
return( AFPERR_PARAM );
}
}
ibuf += sizeof( reqcount );
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_write: of_find");
+ LOG(log_error, logtype_afpd, "afp_write: of_find");
err = AFPERR_PARAM;
goto afp_write_err;
}
case AFPPROTO_ASP:
if (asp_wrtcont(obj->handle, rbuf, rbuflen) < 0) {
*rbuflen = 0;
- LOG(log_error, logtype_default, "afp_write: asp_wrtcont: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_write: asp_wrtcont: %s", strerror(errno) );
return( AFPERR_PARAM );
}
cc = AFPERR_DFULL;
break;
default :
- LOG(log_error, logtype_default, "afp_write: ad_writefile: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_write: ad_writefile: %s", strerror(errno) );
goto afp_write_loop;
}
dsi_writeflush(dsi);
*rbuflen = 0;
if (( ofork = of_find( ofrefnum )) == NULL ) {
- LOG(log_error, logtype_default, "afp_getforkparams: of_find");
+ LOG(log_error, logtype_afpd, "afp_getforkparams: of_find");
return( AFPERR_PARAM );
}
/*
- * $Id: main.c,v 1.17 2002-02-16 11:05:16 srittau Exp $
+ * $Id: main.c,v 1.18 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
dsi_kill(sig);
switch( sig ) {
case SIGTERM :
- LOG(log_info, logtype_default, "shutting down on signal %d", sig );
+ LOG(log_info, logtype_afpd, "shutting down on signal %d", sig );
break;
case SIGHUP :
/* w/ a configuration file, we can force a re-read if we want */
if ((nologin + 1) & 1) {
AFPConfig *config;
- LOG(log_info, logtype_default, "re-reading configuration file");
+ LOG(log_info, logtype_afpd, "re-reading configuration file");
for (config = configs; config; config = config->next)
if (config->server_cleanup)
config->server_cleanup(config);
configfree(configs, NULL);
if (!(configs = configinit(&default_options))) {
- LOG(log_error, logtype_default, "config re-read: no servers configured");
+ LOG(log_error, logtype_afpd, "config re-read: no servers configured");
afp_exit(1);
}
FD_ZERO(&save_rfds);
FD_SET(config->fd, &save_rfds);
}
} else {
- LOG(log_info, logtype_default, "disallowing logins");
+ LOG(log_info, logtype_afpd, "disallowing logins");
auth_unload();
}
break;
default :
- LOG(log_error, logtype_default, "afp_goaway: bad signal" );
+ LOG(log_error, logtype_afpd, "afp_goaway: bad signal" );
}
if ( sig == SIGTERM ) {
AFPConfig *config;
* XXX: this should really be setup after the initial connections. */
if (!(server_children = server_child_alloc(default_options.connections,
CHILD_NFORKS))) {
- LOG(log_error, logtype_default, "main: server_child alloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) );
afp_exit(1);
}
sigemptyset( &sv.sa_mask );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "main: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
afp_exit(1);
}
sigaddset(&sv.sa_mask, SIGTERM);
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "main: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
afp_exit(1);
}
if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "main: sigaction: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
afp_exit(1);
}
sigaddset(&sigs, SIGTERM);
sigprocmask(SIG_BLOCK, &sigs, NULL);
if (!(configs = configinit(&default_options))) {
- LOG(log_error, logtype_default, "main: no servers configured: %s\n", strerror(errno));
+ LOG(log_error, logtype_afpd, "main: no servers configured: %s\n", strerror(errno));
afp_exit(1);
}
sigprocmask(SIG_UNBLOCK, &sigs, NULL);
if (select(FD_SETSIZE, &rfds, NULL, NULL, NULL) < 0) {
if (errno == EINTR)
continue;
- LOG(log_error, logtype_default, "main: can't wait for input: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "main: can't wait for input: %s", strerror(errno));
break;
}
/*
- * $Id: messages.c,v 1.15 2002-03-17 23:50:36 jmarcus Exp $
+ * $Id: messages.c,v 1.16 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
sprintf(filename, "%s/message.%d", SERVERTEXT, getpid());
#ifdef DEBUG
- LOG(log_debug, logtype_default, "Reading file %s ", filename);
+ LOG(log_debug, logtype_afpd, "Reading file %s ", filename);
#endif /* DEBUG */
message=fopen(filename, "r");
if (message==NULL) {
- LOG(log_info, logtype_default, "Unable to open file %s", filename);
+ LOG(log_info, logtype_afpd, "Unable to open file %s", filename);
sprintf(filename, "%s/message", SERVERTEXT);
message=fopen(filename, "r");
}
/* Delete will probably fail otherwise, but let's try anyways */
euid = geteuid();
if (seteuid(0) < 0) {
- LOG(log_error, logtype_default, "Could not switch back to root: %s",
+ LOG(log_error, logtype_afpd, "Could not switch back to root: %s",
strerror(errno));
}
/* Drop privs again, failing this is very bad */
if (seteuid(euid) < 0) {
- LOG(log_error, logtype_default, "Could not switch back to uid %d: %s", euid, strerror(errno));
+ LOG(log_error, logtype_afpd, "Could not switch back to uid %d: %s", euid, strerror(errno));
}
if (rc < 0) {
- LOG(log_error, logtype_default, "Error deleting %s: %s", filename, strerror(rc));
+ LOG(log_error, logtype_afpd, "Error deleting %s: %s", filename, strerror(rc));
}
#ifdef DEBUG
else {
- LOG(log_info, logtype_default, "Deleted %s", filename);
+ LOG(log_info, logtype_afpd, "Deleted %s", filename);
}
- LOG(log_info, logtype_default, "Set server message to \"%s\"", servermesg);
+ LOG(log_info, logtype_afpd, "Set server message to \"%s\"", servermesg);
#endif /* DEBUG */
}
free(filename);
/*
- * $Id: nfsquota.c,v 1.7 2002-01-19 21:29:55 jmarcus Exp $
+ * $Id: nfsquota.c,v 1.8 2002-03-24 01:23:41 sibaz Exp $
*
* parts of this are lifted from the bsd quota program and are
* therefore under the following copyright:
/* figure out the host and path */
if ((hostpath = strchr(vol->v_gvs, ':')) == NULL) {
- LOG(log_error, logtype_default, "can't find hostname for %s", vol->v_gvs);
+ LOG(log_error, logtype_afpd, "can't find hostname for %s", vol->v_gvs);
return AFPERR_PARAM;
}
if(callaurpc(vol, RQUOTAPROG, RQUOTAVERS, RQUOTAPROC_GETQUOTA,
(xdrproc_t) xdr_getquota_args, (char *) &gq_args,
(xdrproc_t) xdr_getquota_rslt, (char *) &gq_rslt) != 0) {
- LOG(log_info, logtype_default, "nfsquota: can't retrieve nfs quota information. \
+ LOG(log_info, logtype_afpd, "nfsquota: can't retrieve nfs quota information. \
make sure that rpc.rquotad is running on %s.", vol->v_gvs);
*hostpath = ':';
return AFPERR_PARAM;
break;
case Q_EPERM:
- LOG(log_error, logtype_default, "nfsquota: quota permission error, host: %s\n",
+ LOG(log_error, logtype_afpd, "nfsquota: quota permission error, host: %s\n",
vol->v_gvs);
break;
break;
default:
- LOG(log_info, logtype_default, "bad rpc result, host: %s\n", vol->v_gvs);
+ LOG(log_info, logtype_afpd, "bad rpc result, host: %s\n", vol->v_gvs);
break;
}
/*
- * $Id: ofork.c,v 1.10 2002-01-19 21:29:55 jmarcus Exp $
+ * $Id: ofork.c,v 1.11 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1996 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
for ( refnum = 0; refnum < nforks; refnum++ ) {
if (oforks[ refnum ] != NULL && (oforks[refnum]->of_vol == vol) &&
flushfork( oforks[ refnum ] ) < 0 ) {
- LOG(log_error, logtype_default, "of_flush: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "of_flush: %s", strerror(errno) );
}
}
return( 0 );
*/
lastrefnum = refnum;
if ( i == nforks ) {
- LOG(log_error, logtype_default, "of_alloc: maximum number of forks exceeded.");
+ LOG(log_error, logtype_afpd, "of_alloc: maximum number of forks exceeded.");
return( NULL );
}
of_refnum = refnum % nforks;
if (( oforks[ of_refnum ] =
(struct ofork *)malloc( sizeof( struct ofork ))) == NULL ) {
- LOG(log_error, logtype_default, "of_alloc: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
return NULL;
}
of = oforks[of_refnum];
if (!ad) {
ad = malloc( sizeof( struct adouble ) );
if (!ad) {
- LOG(log_error, logtype_default, "of_alloc: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
return NULL;
}
* of long unicode names */
if (( of->of_name =(char *)malloc(MACFILELEN + 1)) ==
NULL ) {
- LOG(log_error, logtype_default, "of_alloc: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
if (!ad)
free(of->of_ad);
free(of);
/*
- * $Id: quota.c,v 1.20 2002-02-28 21:20:39 jmarcus Exp $
+ * $Id: quota.c,v 1.21 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
static struct fs_data fsd;
if ( getmnt(0, &fsd, 0, STAT_ONE, file ) < 0 ) {
- LOG(log_info, logtype_default, "special: getmnt %s: %s", file, strerror(errno) );
+ LOG(log_info, logtype_afpd, "special: getmnt %s: %s", file, strerror(errno) );
return( NULL );
}
if ( vol->v_qfd == -1 && vol->v_gvs == NULL) {
if (( p = mountp( vol->v_path, &vol->v_nfs)) == NULL ) {
- LOG(log_info, logtype_default, "getquota: mountp %s fails", vol->v_path );
+ LOG(log_info, logtype_afpd, "getquota: mountp %s fails", vol->v_path );
return( AFPERR_PARAM );
}
if (vol->v_nfs) {
if (( vol->v_gvs = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "getquota: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "getquota: malloc: %s", strerror(errno) );
return AFPERR_MISC;
}
strcpy( vol->v_gvs, p );
} else {
sprintf( buf, "%s/quotas", p );
if (( vol->v_qfd = open( buf, O_RDONLY, 0 )) < 0 ) {
- LOG(log_info, logtype_default, "open %s: %s", buf, strerror(errno) );
+ LOG(log_info, logtype_afpd, "open %s: %s", buf, strerror(errno) );
return( AFPERR_PARAM );
}
}
#else
if ( vol->v_gvs == NULL ) {
if (( p = special( vol->v_path, &vol->v_nfs )) == NULL ) {
- LOG(log_info, logtype_default, "getquota: special %s fails", vol->v_path );
+ LOG(log_info, logtype_afpd, "getquota: special %s fails", vol->v_path );
return( AFPERR_PARAM );
}
if (( vol->v_gvs = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "getquota: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "getquota: malloc: %s", strerror(errno) );
return AFPERR_MISC;
}
strcpy( vol->v_gvs, p );
}
#else /* ultrix */
if ( gettimeofday( &tv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "overquota: gettimeofday: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "overquota: gettimeofday: %s", strerror(errno) );
return( AFPERR_PARAM );
}
if ( dqblk->dqb_btimelimit && dqblk->dqb_btimelimit > tv.tv_sec ) {
/*
- * $Id: switch.c,v 1.6 2002-01-19 21:29:55 jmarcus Exp $
+ * $Id: switch.c,v 1.7 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- LOG(log_info, logtype_default, "afp_null handle %d", *ibuf );
+ LOG(log_info, logtype_afpd, "afp_null handle %d", *ibuf );
*rbuflen = 0;
return( AFPERR_NOOP );
}
postauth_switch[id] = *new;
break;
default:
- LOG(log_debug, logtype_default, "uam_afpserver_action: unknown switch %d[%d]",
+ LOG(log_debug, logtype_afpd, "uam_afpserver_action: unknown switch %d[%d]",
which, id);
return -1;
}
/*
- * $Id: uam.c,v 1.21 2002-03-07 15:59:53 jmarcus Exp $
+ * $Id: uam.c,v 1.22 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
void *module;
if ((module = mod_open(path)) == NULL) {
- LOG(log_error, logtype_default, "uam_load(%s): failed to load: %s", name, mod_error());
+ LOG(log_error, logtype_afpd, "uam_load(%s): failed to load: %s", name, mod_error());
return NULL;
}
if ((mod = (struct uam_mod *) malloc(sizeof(struct uam_mod))) == NULL) {
- LOG(log_error, logtype_default, "uam_load(%s): malloc failed", name);
+ LOG(log_error, logtype_afpd, "uam_load(%s): malloc failed", name);
goto uam_load_fail;
}
if ((p = strchr(buf, '.')))
*p = '\0';
if ((mod->uam_fcn = mod_symbol(module, buf)) == NULL) {
- LOG(log_error, logtype_default, "uam_load(%s): mod_symbol error for symbol %s",
+ LOG(log_error, logtype_afpd, "uam_load(%s): mod_symbol error for symbol %s",
name,
buf);
goto uam_load_err;
}
if (mod->uam_fcn->uam_type != UAM_MODULE_SERVER) {
- LOG(log_error, logtype_default, "uam_load(%s): attempted to load a non-server module",
+ LOG(log_error, logtype_afpd, "uam_load(%s): attempted to load a non-server module",
name);
goto uam_load_err;
}
if (!mod->uam_fcn->uam_setup ||
((*mod->uam_fcn->uam_setup)(name) < 0)) {
- LOG(log_error, logtype_default, "uam_load(%s): uam_setup failed", name);
+ LOG(log_error, logtype_afpd, "uam_load(%s): uam_setup failed", name);
goto uam_load_err;
}
if ((uam = auth_uamfind(type, name, strlen(name)))) {
if (strcmp(uam->uam_path, path)) {
/* it exists, but it's not the same module. */
- LOG(log_error, logtype_default, "uam_register: \"%s\" already loaded by %s",
+ LOG(log_error, logtype_afpd, "uam_register: \"%s\" already loaded by %s",
name, path);
return -1;
}
#ifndef DISABLE_SHELLCHECK
if (!pwd->pw_shell || (*pwd->pw_shell == '\0')) {
- LOG(log_info, logtype_default, "uam_checkuser: User %s does not have a shell", pwd->pw_name);
+ LOG(log_info, logtype_afpd, "uam_checkuser: User %s does not have a shell", pwd->pw_name);
return -1;
}
#endif
#ifndef DISABLE_SHELLCHECK
if (!p) {
- LOG(log_info, logtype_default, "illegal shell %s for %s", pwd->pw_shell, pwd->pw_name);
+ LOG(log_info, logtype_afpd, "illegal shell %s for %s", pwd->pw_shell, pwd->pw_name);
return -1;
}
#endif /* DISABLE_SHELLCHECK */
if ((rc=sia_ses_init(&entity, argc, argv, hostname, username, tty,
colinput, gssapi)) != SIASUCCESS) {
- LOG(log_error, logtype_default, "cannot initialise SIA");
+ LOG(log_error, logtype_afpd, "cannot initialise SIA");
return SIAFAIL;
}
/* save old action for restoration later */
if (sigaction(SIGALRM, NULL, &act))
- LOG(log_error, logtype_default, "cannot save SIGALRM handler");
+ LOG(log_error, logtype_afpd, "cannot save SIGALRM handler");
if ((rc=sia_ses_authent(collect, passphrase, entity)) != SIASUCCESS) {
/* restore old action after clobbering by sia_ses_authent() */
if (sigaction(SIGALRM, &act, NULL))
- LOG(log_error, logtype_default, "cannot restore SIGALRM handler");
+ LOG(log_error, logtype_afpd, "cannot restore SIGALRM handler");
- LOG(log_info, logtype_default, "unsuccessful login for %s",
+ LOG(log_info, logtype_afpd, "unsuccessful login for %s",
(hostname?hostname:"(null)"));
return SIAFAIL;
}
- LOG(log_info, logtype_default, "successful login for %s",
+ LOG(log_info, logtype_afpd, "successful login for %s",
(hostname?hostname:"(null)"));
/* restore old action after clobbering by sia_ses_authent() */
if (sigaction(SIGALRM, &act, NULL))
- LOG(log_error, logtype_default, "cannot restore SIGALRM handler");
+ LOG(log_error, logtype_afpd, "cannot restore SIGALRM handler");
sia_ses_release(&entity);
/*
- * $Id: uid.c,v 1.11 2002-03-17 23:50:37 jmarcus Exp $
+ * $Id: uid.c,v 1.12 2002-03-24 01:23:41 sibaz Exp $
* code: jeff@univrel.pr.uconn.edu
*
* These functions are abstracted here, so that all calls for resolving
uidgidset **pair;
{
if ( seteuid ( (*pair)->uid ) < 0 )
- LOG(log_error, logtype_default, "restore_uidgid: unable to seteuid '%s': %s",
+ LOG(log_error, logtype_afpd, "restore_uidgid: unable to seteuid '%s': %s",
(*pair)->uid, strerror(errno) );
if ( setegid ( (*pair)->gid ) < 0 )
- LOG(log_error, logtype_default, "restore_uidgid: unable to setegid '%s': %s",
+ LOG(log_error, logtype_afpd, "restore_uidgid: unable to setegid '%s': %s",
(*pair)->gid, strerror(errno) );
} /* end function void restore_uidgid ( pair ) */
/* check to see if we have to switch users */
if ( uid = user_to_uid ( (this_volume)->v_forceuid ) ) {
if ( seteuid ( uid ) < 0 )
- LOG(log_error, logtype_default, "set_uidgid: unable to seteuid '%s': %s",
+ LOG(log_error, logtype_afpd, "set_uidgid: unable to seteuid '%s': %s",
(this_volume)->v_forceuid, strerror(errno) );
} /* end of checking for (this_volume)->v_forceuid */
/* check to see if we have to switch groups */
if ( gid = group_to_gid ( (this_volume)->v_forcegid ) ) {
if ( seteuid ( gid ) < 0 )
- LOG(log_error, logtype_default, "set_uidgid: unable to setegid '%s': %s",
+ LOG(log_error, logtype_afpd, "set_uidgid: unable to setegid '%s': %s",
(this_volume)->v_forcegid, strerror(errno) );
} /* end of checking for (this_volume)->v_forcegid */
/*
- * $Id: unix.c,v 1.31 2002-03-05 01:41:36 srittau Exp $
+ * $Id: unix.c,v 1.32 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
if ( statfs( vol->v_path, &sfs ) < 0 ) {
- LOG(log_error, logtype_default, "ustatfs_getvolspace unable to stat %s", vol->v_path);
+ LOG(log_error, logtype_afpd, "ustatfs_getvolspace unable to stat %s", vol->v_path);
return( AFPERR_PARAM );
}
else { /* if S_IWOTH and not S_IROTH */
uid=geteuid();
if ( seteuid(0) < 0) {
- LOG(log_error, logtype_default, "stickydirmode: unable to seteuid root: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "stickydirmode: unable to seteuid root: %s", strerror(errno));
}
if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & ~default_options.umask) ) < 0) {
- LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %s", name, strerror(errno) );
+ LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", name, strerror(errno) );
return(AFPERR_ACCESS);
} else {
#ifdef DEBUG
- LOG(log_info, logtype_default, "stickydirmode: (debug) chmod \"%s\": %s", name, strerror(retval) );
+ LOG(log_info, logtype_afpd, "stickydirmode: (debug) chmod \"%s\": %s", name, strerror(retval) );
#endif /* DEBUG */
seteuid(uid);
} /* end getting retval */
* group writable, in which case chmod will fail.
*/
if ( (chmod( name, (DIRBITS | mode) & ~default_options.umask ) < 0) && errno != EPERM) {
- LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %s",
+ LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s",
name, strerror(errno) );
retval = -1;
}
}
if (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
}
return( -1 );
}
strcat( modbuf, subp->d_name );
/* XXX: need to preserve special modes */
if (stat(modbuf, &st) < 0) {
- LOG(log_error, logtype_default, "setdeskmode: stat %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s",
modbuf, strerror(errno) );
continue;
}
if (S_ISDIR(st.st_mode)) {
if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",
modbuf, strerror(errno) );
}
} else if ( chmod( modbuf, mode & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",
modbuf, strerror(errno) );
}
closedir( sub );
/* XXX: need to preserve special modes */
if ( chmod( deskp->d_name, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",
deskp->d_name, strerror(errno) );
}
}
closedir( desk );
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
return -1;
}
/* XXX: need to preserve special modes */
if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
}
return( 0 );
}
DIR *dir;
if (( dir = opendir( "." )) == NULL ) {
- LOG(log_error, logtype_default, "setdirmode: opendir .: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: opendir .: %s", strerror(errno) );
return( -1 );
}
continue;
}
if ( stat( dirp->d_name, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s",
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",
dirp->d_name, strerror(errno) );
continue;
}
if (( dir = opendir( ".AppleDouble" )) == NULL ) {
if (noadouble)
goto setdirmode_noadouble;
- LOG(log_error, logtype_default, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
return( -1 );
}
strcpy( buf, ".AppleDouble" );
strcat( buf, dirp->d_name );
if ( stat( buf, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s", buf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", buf, strerror(errno) );
continue;
}
}
if (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
}
return( -1 );
}
strcat( modbuf, subp->d_name );
/* XXX: add special any uid, ignore group bits */
if ( chown( modbuf, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskown: chown %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s",
modbuf, strerror(errno) );
}
}
closedir( sub );
/* XXX: add special any uid, ignore group bits */
if ( chown( deskp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskowner: chown %s: %s",
+ LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s",
deskp->d_name, strerror(errno) );
}
}
closedir( desk );
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
return -1;
}
if ( chown( ".AppleDesktop", uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskowner: chown .AppleDesktop: %s",
+ LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s",
strerror(errno) );
}
return( 0 );
continue;
};
if ( stat( dirp->d_name, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirowner: stat %s: %s",
+ LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s",
dirp->d_name, strerror(errno) );
continue;
}
if (( st.st_mode & S_IFMT ) == S_IFREG ) {
if ( chown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %s: %s",
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
dirp->d_name, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
*m = '\0';
strcat( buf, dirp->d_name );
if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d %s: %s",
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
uid, gid, buf, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
* We cheat: we know that chown doesn't do anything.
*/
if ( stat( ".AppleDouble", &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
return( -1 );
}
if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 &&
errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .AppleDouble: %s",
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .AppleDouble: %s",
uid, gid, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
}
if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 &&
errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .: %s",
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .: %s",
uid, gid, strerror(errno) );
}
/*
- * $Id: volume.c,v 1.24 2002-03-16 20:38:09 jmarcus Exp $
+ * $Id: volume.c,v 1.25 2002-03-24 01:23:41 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
}
/* debug: show which codepage directory we are using */
- LOG(log_debug, logtype_default, "using codepage directory: %s", page);
+ LOG(log_debug, logtype_afpd, "using codepage directory: %s", page);
return page;
}
} else if (val) {
/* ignore unknown options */
- LOG(log_debug, logtype_default, "ignoring unknown volume option: %s", tmp);
+ LOG(log_debug, logtype_afpd, "ignoring unknown volume option: %s", tmp);
} else {
/* we'll assume it's a volume name. */
if (( volume =
(struct vol *)calloc(1, sizeof( struct vol ))) == NULL ) {
- LOG(log_error, logtype_default, "creatvol: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
return -1;
}
if (( volume->v_name =
(char *)malloc( vlen + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "creatvol: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
free(volume);
return -1;
}
if (( volume->v_path =
(char *)malloc( strlen( path ) + 1 )) == NULL ) {
- LOG(log_error, logtype_default, "creatvol: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
free(volume->v_name);
free(volume);
return -1;
if ( em == NULL ) {
if (( em =
(struct extmap *)malloc( sizeof( struct extmap ))) == NULL ) {
- LOG(log_error, logtype_default, "setextmap: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setextmap: malloc: %s", strerror(errno) );
return;
}
em->em_next = extmap;
}
volfree(save_options, NULL);
if ( fclose( fp ) != 0 ) {
- LOG(log_error, logtype_default, "readvolfile: fclose: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "readvolfile: fclose: %s", strerror(errno) );
}
return( 0 );
}
data = rbuf + 5;
for ( vcnt = 0, volume = volumes; volume; volume = volume->v_next ) {
if ( stat( volume->v_path, &st ) < 0 ) {
- LOG(log_info, logtype_default, "afp_getsrvrparms: stat %s: %s",
+ LOG(log_info, logtype_afpd, "afp_getsrvrparms: stat %s: %s",
volume->v_path, strerror(errno) );
continue; /* can't access directory */
}
*rbuflen = data - rbuf;
data = rbuf;
if ( gettimeofday( &tv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "afp_getsrvrparms: gettimeofday: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_getsrvrparms: gettimeofday: %s", strerror(errno) );
*rbuflen = 0;
return AFPERR_PARAM;
}
if (( volume->v_flags & AFPVOL_OPEN ) == 0 ) {
if ((dir = dirnew(strlen(volume->v_name) + 1)) == NULL) {
- LOG(log_error, logtype_default, "afp_openvol: malloc: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "afp_openvol: malloc: %s", strerror(errno) );
ret = AFPERR_MISC;
goto openvol_err;
}
* [RS] */
if ( gettimeofday( &tv, 0 ) < 0 ) {
- LOG(log_error, logtype_default, "setvoltime: gettimeofday: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setvoltime: gettimeofday: %s", strerror(errno) );
return;
}
if( utime( vol->v_path, NULL ) < 0 ) {
projects / netatalk.git / commitdiff