#include <atalk/logger.h>
#include <atalk/server_ipc.h>
#include <atalk/uuid.h>
+#include <atalk/globals.h>
-#include "globals.h"
#include "auth.h"
#include "uam_auth.h"
#include "switch.h"
int ngroups;
-/*
- * These numbers are scattered throughout the code.
- */
-static struct afp_versions afp_versions[] = {
-#ifndef NO_DDP
- { "AFPVersion 1.1", 11 },
- { "AFPVersion 2.0", 20 },
- { "AFPVersion 2.1", 21 },
-#endif /* ! NO_DDP */
- { "AFP2.2", 22 },
- { "AFPX03", 30 },
- { "AFP3.1", 31 },
- { "AFP3.2", 32 },
- { "AFP3.3", 33 }
-};
-
static struct uam_mod uam_modules = {NULL, NULL, &uam_modules, &uam_modules};
static struct uam_obj uam_login = {"", "", 0, {{NULL, NULL, NULL, NULL }}, &uam_login,
&uam_login};
static struct uam_obj *afp_uam = NULL;
-void status_versions( char *data, const ASP asp, const DSI *dsi)
+void status_versions(char *data,
+#ifndef NO_DDP
+ const ASP asp,
+#endif
+ const DSI *dsi)
{
char *start = data;
u_int16_t status;
return AFP_OK;
}
+#define GROUPSTR_BUFSIZE 1024
+static const char *print_groups(int ngroups, gid_t *groups)
+{
+ static char groupsstr[GROUPSTR_BUFSIZE];
+ int i;
+ char *s = groupsstr;
+
+ if (ngroups == 0)
+ return "-";
+
+ for (i = 0; (i < ngroups) && (s < &groupsstr[GROUPSTR_BUFSIZE]); i++) {
+ s += snprintf(s, &groupsstr[GROUPSTR_BUFSIZE] - s, " %u", groups[i]);
+ }
+
+ return groupsstr;
+}
+
static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void), int expired)
{
#ifdef ADMIN_GRP
int admin = 0;
#endif /* ADMIN_GRP */
-#if 0
- set_processname("afpd");
-#endif
-
if ( pwd->pw_uid == 0 ) { /* don't allow root login */
LOG(log_error, logtype_afpd, "login: root login denied!" );
return AFPERR_NOTAUTH;
}
#endif /* TRU64 */
- if (ngroups > 0) {
- #define GROUPSTR_BUFSIZE 1024
- char groupsstr[GROUPSTR_BUFSIZE];
- char *s = groupsstr;
- int j = GROUPSTR_BUFSIZE;
-
- int n = snprintf(groupsstr, GROUPSTR_BUFSIZE, "%u", groups[0]);
- j -= n;
- s += n;
-
- for (int i = 1; i < ngroups; i++) {
- n = snprintf(s, j, ", %u", groups[i]);
- if (n == j) {
- /* Buffer full */
- LOG(log_debug, logtype_afpd, "login: group string buffer overflow");
- break;
- }
- j -= n;
- s += n;
- }
- LOG(log_debug, logtype_afpd, "login: %u supplementary groups: %s", ngroups, groupsstr);
- }
+ LOG(log_debug, logtype_afpd, "login: supplementary groups: %s", print_groups(ngroups, groups));
/* There's probably a better way to do this, but for now, we just play root */
#ifdef ADMIN_GRP
save_uidgid ( &obj->uidgid );
#endif
+ /* pam_umask or similar might have changed our umask */
+ (void)umask(obj->options.umask);
+
+ /* Some PAM module might have reset our signal handlers and timer, so we need to reestablish them */
+ afp_over_dsi_sighandlers(obj);
+
return( AFP_OK );
}
if (!obj->sinfo.clientid) {
obj->sinfo.clientid = malloc(idlen + 8);
memcpy(obj->sinfo.clientid, p, idlen + 8);
+ obj->sinfo.clientid_len = idlen + 8;
}
- if (ipc_child_write(&obj->ipc_fd, IPC_GETSESSION, idlen+8, p) == -1) {
-
- }
+ if (ipc_child_write(obj->ipc_fd, IPC_GETSESSION, idlen+8, p) != 0)
+ return AFPERR_MISC;
tklen = obj->sinfo.sessiontoken_len;
token = obj->sinfo.sessiontoken;
}
setitimer(ITIMER_REAL, &none, NULL);
/* check for old session, possibly transfering session from here to there */
- if (ipc_child_write(&obj->ipc_fd, IPC_DISCOLDSESSION, tklen, &token) == -1)
+ if (ipc_child_write(obj->ipc_fd, IPC_DISCOLDSESSION, tklen, &token) != 0)
goto exit;
/* write uint16_t DSI request ID */
if (writet(obj->ipc_fd, &dsi->header.dsi_requestID, 2, 0, 2) != 2) {