X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fauth-unix.c;h=7cf9c8ef90dabe3f0d89882057b898069fbd5e26;hb=HEAD;hp=6f0e7c6822886ed3d69c612457465c11af7eb02b;hpb=75a50bc29991e6cfc5f3031b3ae71bad0ffca376;p=doldaconnect.git

diff --git a/daemon/auth-unix.c b/daemon/auth-unix.c
index 6f0e7c6..7cf9c8e 100644
--- a/daemon/auth-unix.c
+++ b/daemon/auth-unix.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -59,16 +59,18 @@ static int unixauth(struct authhandle *auth, struct socket *sk, char *passdata)
 {
     struct passwd *pwd;
     struct unixdata *data;
+    uid_t uid;
+    gid_t gid;
     
     data = auth->mechdata;
     if((pwd = getpwnam(data->username)) == NULL)
 	return(AUTH_ERR);
-    if(sk->ucred.uid == -1) {
+    if(getucred(sk, &uid, &gid)) {
 	errno = EOPNOTSUPP; /* Bleh */
 	return(AUTH_ERR);
     }
-    if(pwd->pw_uid == sk->ucred.uid) {
-	flog(LOG_INFO, "successful authentication as %s with Unix credentials (uid=%i, gid=%i)", data->username, sk->ucred.uid, sk->ucred.gid);
+    if(pwd->pw_uid == uid) {
+	flog(LOG_INFO, "successful authentication as %s with Unix credentials (uid=%i, gid=%i)", data->username, uid, gid);
 	return(AUTH_SUCCESS);
     }
     auth->text = swcsdup(L"Unix credentials do not match supplied user name");
@@ -77,7 +79,7 @@ static int unixauth(struct authhandle *auth, struct socket *sk, char *passdata)
 
 static int available(struct socket *sk)
 {
-    return((sk->family == PF_UNIX) && (sk->ucred.uid != -1));
+    return(sockfamily(sk) == PF_UNIX);
 }
 
 static struct authmech mechdesc = {