Attachment 4106 Details for Bug 6316 – Revised patch

[patch] Revised patch

afs.patch (text/plain), 2.64 KB, created by Geza Gemes (dead mail address) on 2009-05-03 14:31:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Geza Gemes (dead mail address)

Created: 2009-05-03 14:31:10 UTC

Size: 2.64 KB

patch

obsolete

>diff -ur samba-3.3.4.orig/source/configure.in samba-3.3.4/source/configure.in
>--- samba-3.3.4.orig/source/configure.in	2009-05-02 12:17:58.000000000 +0200
>+++ samba-3.3.4/source/configure.in	2009-05-03 21:00:57.000000000 +0200
>@@ -3099,13 +3099,14 @@
> # decide whether we can support WITH_AFS and / or WITH_FAKE_KASERVER
> if test x"$samba_cv_WITH_AFS" != x"no" ||
>    test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
>+ 
>+    # see if this box has the OpenSSL DES libraries 
>+    AC_CHECK_LIB( crypto, DES_pcbc_encrypt, LIBS="$LIBS -lcrypto" , [AC_ERROR(OpenSSL library: libcrypto ot found!)] )
> 
>     # see if this box has the afs-headers in /usr/include/afs
>     AC_MSG_CHECKING(for /usr/include/afs)
>     if test -d /usr/include/afs; then
>-          CFLAGS="$CFLAGS -I/usr/include/afs"
>-          CPPFLAGS="$CPPFLAGS -I/usr/include/afs"
>           AC_MSG_RESULT(yes)
>     else
>       AC_MSG_RESULT(no)
>     fi
>diff -ur samba-3.3.4.orig/source/lib/afs.c samba-3.3.4/source/lib/afs.c
>--- samba-3.3.4.orig/source/lib/afs.c	2009-05-02 12:17:58.000000000 +0200
>+++ samba-3.3.4/source/lib/afs.c	2009-05-02 15:23:22.000000000 +0200
>@@ -23,6 +23,7 @@
> 
> #define NO_ASN1_TYPEDEFS 1
> 
>+#include <afs/param.h>
> #include <afs/stds.h>
> #include <afs/afs.h>
> #include <afs/auth.h>
>@@ -230,8 +231,8 @@
> 	}
> 
> 	afs_username = talloc_sub_advanced(ctx,
>-				SNUM(conn), conn->user,
>-				conn->connectpath, conn->gid,
>+				SNUM(conn), conn->server_info->unix_name,
>+				conn->connectpath, conn->server_info->utok.gid,
> 				conn->server_info->sanitized_username,
> 				pdb_get_domain(conn->server_info->sam_account),
> 				afs_username);
>diff -ur samba-3.3.4.orig/source/lib/afs_settoken.c samba-3.3.4/source/lib/afs_settoken.c
>--- samba-3.3.4.orig/source/lib/afs_settoken.c	2009-05-02 12:17:58.000000000 +0200
>+++ samba-3.3.4/source/lib/afs_settoken.c	2009-05-02 12:25:36.000000000 +0200
>@@ -23,6 +23,7 @@
> 
> #define NO_ASN1_TYPEDEFS 1
> 
>+#include <afs/param.h>
> #include <afs/stds.h>
> #include <afs/afs.h>
> #include <afs/auth.h>
>@@ -37,7 +38,24 @@
> 	  char * cmarg,
> 	  int follow)
> {
>+/*
> 	return( syscall( SYS_afs_syscall, subcall, path, cmd, cmarg, follow));
>+*/
>+	int errcode;
>+	struct afsprocdata afs_syscall_data;
>+	afs_syscall_data.syscall = subcall;
>+	afs_syscall_data.param1 = (long)path;
>+	afs_syscall_data.param2 = cmd;
>+	afs_syscall_data.param3 = (long)cmarg;
>+	afs_syscall_data.param4 = follow;
>+	int proc_afs_file = open(PROC_SYSCALL_FNAME, O_RDWR);
>+	if (proc_afs_file < 0)
>+		proc_afs_file = open(PROC_SYSCALL_ARLA_FNAME, O_RDWR);
>+	if (proc_afs_file < 0)
>+		return -1;
>+	errcode = ioctl(proc_afs_file, VIOC_SYSCALL, &afs_syscall_data);
>+	close(proc_afs_file);
>+	return errcode;
> }
> 
> struct ClearToken {

Actions: View

Attachments on bug 6316: 4103 | 4106