X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fuams%2Fuams_pam.c;h=25ee5814b3ae440231bea067e65025fba1fe1f4e;hp=25b86753796e0bcec0ca9e19d60d72d211bc21f7;hb=75fe310224dffb96868d7f2cb1ec9125a84f2a08;hpb=d7c1ee14c81a3c6496e6285fd3e1aab275f224d4 diff --git a/etc/uams/uams_pam.c b/etc/uams/uams_pam.c index 25b86753..25ee5814 100644 --- a/etc/uams/uams_pam.c +++ b/etc/uams/uams_pam.c @@ -1,5 +1,5 @@ /* - * $Id: uams_pam.c,v 1.15 2003-01-08 22:16:25 didg Exp $ + * $Id: uams_pam.c,v 1.22 2009-11-05 14:38:07 franklahm Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) @@ -10,7 +10,6 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifndef ATACC #include #include #ifdef HAVE_UNISTD_H @@ -34,21 +33,36 @@ char *strchr (), *strrchr (); #include +#ifdef HAVE_SECURITY_PAM_APPL_H #include +#endif +#ifdef HAVE_PAM_PAM_APPL_H +#include +#endif #include #include +#include #define PASSWDLEN 8 +#ifndef MIN +#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif /* MIN */ + + /* Static variables used to communicate between the conversation function * and the server_login function */ static pam_handle_t *pamh = NULL; -static char *hostname; +static const char *hostname; static char *PAM_username; static char *PAM_password; +/*XXX in etc/papd/file.h */ +struct papfile; +extern void append(struct papfile *, const char *, int); + /* PAM conversation function * Here we assume (for now, at least) that echo on means login name, and * echo off means password. @@ -56,7 +70,7 @@ static char *PAM_password; static int PAM_conv (int num_msg, const struct pam_message **msg, struct pam_response **resp, - void *appdata_ptr) + void *appdata_ptr _U_) { struct pam_response *reply; int count; @@ -126,8 +140,8 @@ static struct pam_conv PAM_conversation = { }; static int login(void *obj, char *username, int ulen, struct passwd **uam_pwd, - char *ibuf, int ibuflen, - char *rbuf, int *rbuflen) + char *ibuf, size_t ibuflen _U_, + char *rbuf _U_, size_t *rbuflen _U_) { struct passwd *pwd; int err, PAM_error; @@ -141,7 +155,7 @@ static int login(void *obj, char *username, int ulen, struct passwd **uam_pwd, ibuf[ PASSWDLEN ] = '\0'; - if (( pwd = uam_getname(username, ulen)) == NULL ) { + if (( pwd = uam_getname(obj, username, ulen)) == NULL ) { return AFPERR_PARAM; } @@ -167,13 +181,14 @@ static int login(void *obj, char *username, int ulen, struct passwd **uam_pwd, PAM_error = pam_acct_mgmt(pamh, 0); if (PAM_error != PAM_SUCCESS) { - if (PAM_error == PAM_ACCT_EXPIRED) + if (PAM_error == PAM_NEW_AUTHTOK_REQD) /* Password change required */ err = AFPERR_PWDEXPR; #ifdef PAM_AUTHTOKEN_REQD else if (PAM_error == PAM_AUTHTOKEN_REQD) err = AFPERR_PWDCHNG; #endif /* PAM_AUTHTOKEN_REQD */ - goto login_err; + else + goto login_err; } #ifndef PAM_CRED_ESTABLISH @@ -188,6 +203,10 @@ static int login(void *obj, char *username, int ulen, struct passwd **uam_pwd, goto login_err; *uam_pwd = pwd; + + if (err == AFPERR_PWDEXPR) + return err; + return AFP_OK; login_err: @@ -200,11 +219,11 @@ login_err: cleartxt login */ static int pam_login(void *obj, struct passwd **uam_pwd, - char *ibuf, int ibuflen, - char *rbuf, int *rbuflen) + char *ibuf, size_t ibuflen, + char *rbuf, size_t *rbuflen) { char *username; - int len, ulen; + size_t len, ulen; *rbuflen = 0; @@ -221,6 +240,7 @@ static int pam_login(void *obj, struct passwd **uam_pwd, ibuf += len; username[ len ] = '\0'; + if ((unsigned long) ibuf & 1) /* pad character */ ++ibuf; return (login(obj, username, ulen, uam_pwd, ibuf, ibuflen, rbuf, rbuflen)); @@ -228,11 +248,11 @@ static int pam_login(void *obj, struct passwd **uam_pwd, /* ----------------------------- */ static int pam_login_ext(void *obj, char *uname, struct passwd **uam_pwd, - char *ibuf, int ibuflen, - char *rbuf, int *rbuflen) + char *ibuf, size_t ibuflen, + char *rbuf, size_t *rbuflen) { char *username; - int len, ulen; + size_t len, ulen; u_int16_t temp16; *rbuflen = 0; @@ -251,21 +271,21 @@ static int pam_login_ext(void *obj, char *uname, struct passwd **uam_pwd, } memcpy(username, uname +2, len ); username[ len ] = '\0'; - + return (login(obj, username, ulen, uam_pwd, ibuf, ibuflen, rbuf, rbuflen)); } /* logout */ -static void pam_logout() { +static void pam_logout(void) { pam_close_session(pamh, 0); pam_end(pamh, 0); pamh = NULL; } /* change passwd */ -static int pam_changepw(void *obj, char *username, - struct passwd *pwd, char *ibuf, int ibuflen, - char *rbuf, int *rbuflen) +static int pam_changepw(void *obj _U_, char *username, + struct passwd *pwd _U_, char *ibuf, size_t ibuflen _U_, + char *rbuf _U_, size_t *rbuflen _U_) { char pw[PASSWDLEN + 1]; pam_handle_t *lpamh; @@ -323,17 +343,21 @@ static int pam_changepw(void *obj, char *username, /* Printer ClearTxtUAM login */ -int pam_printer(start, stop, username, out) - char *start, *stop, *username; - struct papfile *out; +static int pam_printer(char *start, char *stop, char *username, struct papfile *out) { int PAM_error; char *data, *p, *q; char password[PASSWDLEN + 1] = "\0"; static const char *loginok = "0\r"; + struct passwd *pwd; data = (char *)malloc(stop - start + 1); - strncpy(data, start, stop - start + 1); + if (!data) { + LOG(log_info, logtype_uams,"Bad Login ClearTxtUAM: malloc"); + return(-1); + } + + strlcpy(data, start, stop - start + 1); /* We are looking for the following format in data: * (username) (password) @@ -348,25 +372,36 @@ int pam_printer(start, stop, username, out) return(-1); } p++; - if ((q = strstr(data, ") (" )) == NULL) { + if ((q = strstr(p, ") (" )) == NULL) { LOG(log_info, logtype_uams,"Bad Login ClearTxtUAM: username not found in string"); free(data); return(-1); } - strncpy(username, p, q - p); + memcpy(username, p, MIN(UAM_USERNAMELEN, q - p) ); /* Parse input for password in next () */ p = q + 3; - if ((q = strrchr(data, ')' )) == NULL) { + if ((q = strrchr(p, ')' )) == NULL) { LOG(log_info, logtype_uams,"Bad Login ClearTxtUAM: password not found in string"); free(data); return(-1); } - strncpy(password, p, q - p); + memcpy(password, p, MIN(PASSWDLEN, (q - p)) ); /* Done copying username and password, clean up */ free(data); + if (( pwd = uam_getname(NULL, username, strlen(username))) == NULL ) { + LOG(log_info, logtype_uams, "Bad Login ClearTxtUAM: ( %s ) not found ", + username); + return(-1); + } + + if (uam_checkuser(pwd) < 0) { + /* syslog of error happens in uam_checkuser */ + return(-1); + } + PAM_username = username; PAM_password = password; @@ -459,4 +494,3 @@ UAM_MODULE_EXPORT struct uam_export uams_pam = { UAM_MODULE_VERSION, uam_setup, uam_cleanup }; -#endif