Attachment 5051 Details for Bug 6929 – v3-4-test missing patch

[patch] v3-4-test missing patch

v3-4-test-missing-hunk.patch (text/plain), 1.49 KB, created by Guenther Deschner on 2009-12-03 07:53:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2009-12-03 07:53:01 UTC

Size: 1.49 KB

patch

obsolete

>From 3b58e59f7fdf1b3feacfe9686756afd5bb31ee39 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Fri, 27 Nov 2009 18:30:18 +0100
>Subject: [PATCH] s3-kerberos: do not include authdata headers before including krb5 headers.
>
>Guenther
>---
> source3/include/authdata.h |    2 --
> source3/include/includes.h |    1 -
> source3/libads/authdata.c  |    1 +
> 3 files changed, 1 insertions(+), 3 deletions(-)
>
>diff --git a/source3/include/authdata.h b/source3/include/authdata.h
>index 70f6d2d..e1a5155 100644
>--- a/source3/include/authdata.h
>+++ b/source3/include/authdata.h
>@@ -21,8 +21,6 @@
> #ifndef _AUTHDATA_H
> #define _AUTHDATA_H
> 
>-#include "rpc_misc.h"
>-
> #define PAC_TYPE_LOGON_INFO 1
> #define PAC_TYPE_SERVER_CHECKSUM 6
> #define PAC_TYPE_PRIVSVR_CHECKSUM 7
>diff --git a/source3/include/includes.h b/source3/include/includes.h
>index 471b955..922ec6b 100644
>--- a/source3/include/includes.h
>+++ b/source3/include/includes.h
>@@ -608,7 +608,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
> #include "passdb.h"
> #include "rpc_secdes.h"
> #include "gpo.h"
>-#include "authdata.h"
> #include "msdfs.h"
> #include "rap.h"
> #include "../lib/crypto/md5.h"
>diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
>index 7d566ab..d242919 100644
>--- a/source3/libads/authdata.c
>+++ b/source3/libads/authdata.c
>@@ -25,6 +25,7 @@
> #include "includes.h"
> #include "librpc/gen_ndr/ndr_krb5pac.h"
> #include "smb_krb5.h"
>+#include "authdata.h"
> 
> #ifdef HAVE_KRB5
> 
>-- 
>1.6.5.2
>

Actions: View

Attachments on bug 6929: 5011 | 5016 | 5017 | 5024 | 5038 | 5051