/*
- * $Id: auth.c,v 1.65 2009-09-28 12:04:51 franklahm Exp $
+ * $Id: auth.c,v 1.68 2009-10-15 10:43:13 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "switch.h"
#include "status.h"
#include "fork.h"
+#include "extattrs.h"
#ifdef HAVE_NFSv4_ACLS
#include "acls.h"
#endif
-#ifdef HAVE_EXT_ATTRS
-#include "extattrs.h"
-#endif
int afp_version = 11;
static int afp_version_index;
static struct uam_obj *afp_uam = NULL;
-void status_versions( data )
- char *data;
+void status_versions( char *data)
{
char *start = data;
u_int16_t status;
return AFP_OK;
}
-static int afp_errpwdexpired(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+static int afp_errpwdexpired(AFPObj *obj _U_, char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf _U_, size_t *rbuflen)
{
*rbuflen = 0;
return AFPERR_PWDEXPR;
}
-static int afp_null_nolog(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+static int afp_null_nolog(AFPObj *obj _U_, char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf _U_, size_t *rbuflen)
{
*rbuflen = 0;
return( AFPERR_NOOP );
afp_switch = postauth_switch;
switch (afp_version) {
case 32:
- uam_afpserver_action(AFP_SPOTLIGHT_PRIVATE, UAM_AFPSERVER_POSTAUTH, afp_null_nolog, NULL);
- uam_afpserver_action(AFP_SYNCDIR, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
- uam_afpserver_action(AFP_SYNCFORK, UAM_AFPSERVER_POSTAUTH, afp_syncfork, NULL);
#ifdef HAVE_NFSv4_ACLS
uam_afpserver_action(AFP_GETACL, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
uam_afpserver_action(AFP_SETACL, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
uam_afpserver_action(AFP_ACCESS, UAM_AFPSERVER_POSTAUTH, afp_access, NULL);
#endif
-#ifdef HAVE_EXT_ATTRS
uam_afpserver_action(AFP_GETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_getextattr, NULL);
uam_afpserver_action(AFP_SETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_setextattr, NULL);
uam_afpserver_action(AFP_REMOVEATTR, UAM_AFPSERVER_POSTAUTH, afp_remextattr, NULL);
uam_afpserver_action(AFP_LISTEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_listextattr, NULL);
-#endif
case 31:
+ uam_afpserver_action(AFP_SYNCDIR, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
+ uam_afpserver_action(AFP_SYNCFORK, UAM_AFPSERVER_POSTAUTH, afp_syncfork, NULL);
+ uam_afpserver_action(AFP_SPOTLIGHT_PRIVATE, UAM_AFPSERVER_POSTAUTH, afp_null_nolog, NULL);
uam_afpserver_action(AFP_ENUMERATE_EXT2, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext2, NULL);
case 30:
uam_afpserver_action(AFP_ENUMERATE_EXT, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext, NULL);
}
/* ---------------------- */
-int afp_zzz (obj, ibuf, ibuflen, rbuf, rbuflen ) /* Function 122 */
- AFPObj *obj;
- char *ibuf _U_, *rbuf;
- unsigned int ibuflen _U_, *rbuflen;
+int afp_zzz ( /* Function 122 */
+ AFPObj *obj,
+ char *ibuf _U_, size_t ibuflen _U_,
+ char *rbuf, size_t *rbuflen)
{
u_int32_t retdata;
/* ---------------------- */
-int afp_getsession(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- unsigned int ibuflen, *rbuflen;
+int afp_getsession(
+ AFPObj *obj,
+ char *ibuf, size_t ibuflen,
+ char *rbuf, size_t *rbuflen)
{
u_int16_t type;
u_int32_t idlen = 0;
*rbuflen = 0;
tklen = 0;
+ if (ibuflen < 2 + sizeof(type)) {
+ return AFPERR_PARAM;
+ }
+
ibuf += 2;
ibuflen -= 2;
}
/* ---------------------- */
-int afp_disconnect(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf, *rbuf _U_;
- int ibuflen _U_, *rbuflen;
+int afp_disconnect(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
u_int16_t type;
}
/* ---------------------- */
-static int get_version(obj, ibuf, ibuflen, len)
- AFPObj *obj;
- char *ibuf;
- int ibuflen;
- int len;
+static int get_version(AFPObj *obj, char *ibuf, size_t ibuflen, size_t len)
{
int num,i;
}
/* ---------------------- */
-int afp_login(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_login(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
- int len, i;
+ size_t len;
+ int i;
*rbuflen = 0;
if ( nologin & 1)
return send_reply(obj, AFPERR_SHUTDOWN );
- if (ibuflen <= 1)
+ if (ibuflen < 2)
return send_reply(obj, AFPERR_BADVERS );
ibuf++;
if (i)
return send_reply(obj, i );
+ if (ibuflen <= len)
+ return send_reply(obj, AFPERR_BADUAM);
+
ibuf += len;
ibuflen -= len;
- if (ibuflen <= 1)
- return send_reply(obj, AFPERR_BADUAM);
-
len = (unsigned char) *ibuf++;
ibuflen--;
}
/* ---------------------- */
-int afp_login_ext(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- unsigned int ibuflen, *rbuflen;
+int afp_login_ext(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
- unsigned int len;
+ size_t len;
int i;
char type;
u_int16_t len16;
if ( nologin & 1)
return send_reply(obj, AFPERR_SHUTDOWN );
- if (ibuflen <= 4)
+ if (ibuflen < 5)
return send_reply(obj, AFPERR_BADVERS );
ibuf++;
if (i)
return send_reply(obj, i );
+ if (ibuflen <= len)
+ return send_reply(obj, AFPERR_BADUAM);
+
ibuf += len;
ibuflen -= len;
- if (ibuflen <= 1)
- return send_reply(obj, AFPERR_BADUAM);
-
len = (unsigned char) *ibuf;
ibuf++;
ibuflen--;
return send_reply(obj, AFPERR_BADUAM);
}
/* user name */
- if (len <= 1 +sizeof(len16))
+ if (ibuflen <= 1 +sizeof(len16))
return send_reply(obj, AFPERR_PARAM);
type = *ibuf;
username = ibuf;
}
/* ---------------------- */
-int afp_logincont(obj, ibuf, ibuflen, rbuf, rbuflen)
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_logincont(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
struct passwd *pwd = NULL;
int err;
- if ( afp_uam == NULL || afp_uam->u.uam_login.logincont == NULL ) {
+ if ( afp_uam == NULL || afp_uam->u.uam_login.logincont == NULL || ibuflen < 2 ) {
*rbuflen = 0;
return send_reply(obj, AFPERR_NOTAUTH );
}
}
-int afp_logout(obj, ibuf, ibuflen, rbuf, rbuflen)
- AFPObj *obj;
- char *ibuf _U_, *rbuf _U_;
- int ibuflen _U_, *rbuflen _U_;
+int afp_logout(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen _U_)
{
LOG(log_info, logtype_afpd, "logout %s", obj->username);
close_all_vol();
* to work. this also does a little pre-processing before it hands
* it off to the uam.
*/
-int afp_changepw(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+int afp_changepw(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
{
char username[MACFILELEN + 1], *start = ibuf;
struct uam_obj *uam;
return AFPERR_PARAM;
/* send it off to the uam. we really don't use ibuflen right now. */
+ if (ibuflen < (size_t)(ibuf - start))
+ return AFPERR_PARAM;
+
ibuflen -= (ibuf - start);
ret = uam->u.uam_changepw(obj, username, pwd, ibuf, ibuflen,
rbuf, rbuflen);
/* FPGetUserInfo */
-int afp_getuserinfo(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj _U_;
- char *ibuf, *rbuf;
- int ibuflen _U_, *rbuflen;
+int afp_getuserinfo(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
{
u_int8_t thisuser;
u_int32_t id;
}
/* get rid of all of the uams */
-void auth_unload()
+void auth_unload(void)
{
struct uam_mod *mod, *prev, *start = &uam_modules;