Changeset 370 for branches/samba-3.3.x/source/libads

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

Location:

branches/samba-3.3.x/source/libads

Files:

• ads_status.c (modified) (1 diff)
• authdata.c (modified) (1 diff)
• kerberos.c (modified) (2 diffs)
• kerberos_keytab.c (modified) (1 diff)
• kerberos_verify.c (modified) (1 diff)
• krb5_errs.c (modified) (1 diff)
• krb5_setpw.c (modified) (4 diffs)

branches/samba-3.3.x/source/libads/ads_status.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 /*

branches/samba-3.3.x/source/libads/authdata.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "smb_krb5.h"
+#include "authdata.h"
 
 #ifdef HAVE_KRB5

branches/samba-3.3.x/source/libads/kerberos.c

@@ -23 +23 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_KRB5
@@ -47 +48 @@
         if (prompts[0].reply->length > 0) {
                 if (data) {
-                        strncpy(prompts[0].reply->data, (const char *)data,
+                        strncpy((char *)prompts[0].reply->data, (const char *)data,
                                 prompts[0].reply->length-1);
-                        prompts[0].reply->length = strlen(prompts[0].reply->data);
+                        prompts[0].reply->length = strlen((const char *)prompts[0].reply->data);
                 } else {
                         prompts[0].reply->length = 0;

branches/samba-3.3.x/source/libads/kerberos_keytab.c

@@ -27 +27 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_KRB5

branches/samba-3.3.x/source/libads/kerberos_verify.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_KRB5

branches/samba-3.3.x/source/libads/krb5_errs.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_KRB5

branches/samba-3.3.x/source/libads/krb5_setpw.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_KRB5
@@ -286 +287 @@
         }
         
-        p = packet->data;
+        p = (char *)packet->data;
         /*
         ** see if it is an error
@@ -369 +370 @@
         }
         
-        p = clearresult.data;
+        p = (char *)clearresult.data;
         
         res_code = RSVAL(p, 0);
@@ -694 +695 @@
         if (prompts[0].reply->length > 0) {
                 if (data) {
-                        strncpy(prompts[0].reply->data,
+                        strncpy((char *)prompts[0].reply->data,
                                 (const char *)data,
                                 prompts[0].reply->length-1);
-                        prompts[0].reply->length = strlen(prompts[0].reply->data);
+                        prompts[0].reply->length = strlen((const char *)prompts[0].reply->data);
                 } else {
                         prompts[0].reply->length = 0;