The branch, master has been updated
via 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (commit)
via 510e37155eab8b4bf29adcf10f242334bfedca46 (commit)
via 9521801dc89a425a2d1e58d0cf7ca24e83b02a04 (commit)
via 4d9641793124954e5994e64e9ce810f8f76e0449 (commit)
via 8a264753a1f80defe5335c334f8242ad46d2af9f (commit)
from 2d087a0c156dc95086a39e297b24ef6889e1a50d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 25 11:22:01 2009 +0100
s4:heimdal_build: provide heimdal_version and heimdal_long_version symbols
metze
commit 510e37155eab8b4bf29adcf10f242334bfedca46
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 25 11:20:50 2009 +0100
s4:heimdal_build: define HAVE_STRLCPY, HAVE_STRLCAT, HAVE_STRCASECMP and
HAVE_MKSTEMP
metze
commit 9521801dc89a425a2d1e58d0cf7ca24e83b02a04
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 25 12:21:59 2009 +0100
s4:kdc: use krb5_data_free()
metze
commit 4d9641793124954e5994e64e9ce810f8f76e0449
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 25 12:21:36 2009 +0100
s4:auth/credentials: use krb5_data_free()
metze
commit 8a264753a1f80defe5335c334f8242ad46d2af9f
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 25 11:17:17 2009 +0100
s4:auth/credentials: include gssapi/gssapi_krb5.h
metze
-----------------------------------------------------------------------
Summary of changes:
source4/auth/credentials/credentials_krb5.h | 1 +
source4/auth/kerberos/clikrb5.c | 6 +-----
source4/heimdal_build/replace.c | 4 ++++
source4/heimdal_build/roken.h | 19 +++++++++++++++++++
source4/kdc/kdc.c | 2 +-
5 files changed, 26 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/credentials/credentials_krb5.h
b/source4/auth/credentials/credentials_krb5.h
index 0d0e9f3..5e56752 100644
--- a/source4/auth/credentials/credentials_krb5.h
+++ b/source4/auth/credentials/credentials_krb5.h
@@ -24,6 +24,7 @@
#define __CREDENTIALS_KRB5_H__
#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_krb5.h>
#include <krb5.h>
struct gssapi_creds_container {
diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c
index cf87d13..68e7eb9 100644
--- a/source4/auth/kerberos/clikrb5.c
+++ b/source4/auth/kerberos/clikrb5.c
@@ -74,13 +74,9 @@
void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
{
-#if defined(HAVE_KRB5_FREE_DATA_CONTENTS)
if (pdata->data) {
- krb5_free_data_contents(context, pdata);
+ krb5_data_free(pdata);
}
-#else
- SAFE_FREE(pdata->data);
-#endif
}
krb5_error_code smb_krb5_kt_free_entry(krb5_context context,
krb5_keytab_entry *kt_entry)
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index 41309fe..ba43dd9 100644
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -84,3 +84,7 @@
return -1;
}
#endif
+
+const char *heimdal_version = "samba-internal-heimdal";
+const char *heimdal_long_version = "samba-interal-heimdal";
+
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 3edeb2f..e3edd53 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -41,6 +41,22 @@
#define HAVE_STRNDUP
#endif
+#ifndef HAVE_STRLCPY
+#define HAVE_STRLCPY
+#endif
+
+#ifndef HAVE_STRLCAT
+#define HAVE_STRLCAT
+#endif
+
+#ifndef HAVE_STRCASECMP
+#define HAVE_STRCASECMP
+#endif
+
+#ifndef HAVE_MKSTEMP
+#define HAVE_MKSTEMP
+#endif
+
#ifndef HAVE_SETENV
#define HAVE_SETENV
#endif
@@ -84,4 +100,7 @@
#undef SOCKET_WRAPPER_REPLACE
#include "heimdal/lib/roken/roken.h.in"
+extern const char *heimdal_version;
+extern const char *heimdal_long_version;
+
#endif
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 1cfe985..3d11441 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -345,7 +345,7 @@ static bool kdc_process(struct kdc_server *kdc,
}
if (k5_reply.length) {
*reply = data_blob_talloc(mem_ctx, k5_reply.data,
k5_reply.length);
- krb5_free_data_contents(kdc->smb_krb5_context->krb5_context,
&k5_reply);
+ krb5_data_free(&k5_reply);
} else {
*reply = data_blob(NULL, 0);
}
--
Samba Shared Repository
