Merge from HEAD - vl's fix to my const patch. Also update the 'not have_krb5'

case.

Andrew Bartlett

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index a7b11d777eaa868e7e7fceb7e581edb76bc6fcc6..cca2a9cd3aeb2b28928cf890efeb8429e3045c10 100644 (file)
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -156,7 +156,7 @@ failed:
 
 #else /* HAVE_KRB5 */
  /* this saves a few linking headaches */
- DATA_BLOB krb5_get_ticket(char *principal, time_t time_offset)
+ DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset)
  {
         DEBUG(0,("NO KERBEROS SUPPORT\n"));
         return data_blob(NULL, 0);