samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r19416 - in branches/SAMBA_3_0/source: libsmb utils

Subject: svn commit: samba r19416 - in branches/SAMBA_3_0/source: libsmb utils
From:
Date: Thu, 19 Oct 2006 21:47:12 +0000 GMT
Author: gd
Date: 2006-10-19 21:47:11 +0000 (Thu, 19 Oct 2006)
New Revision: 19416

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19416

Log:
Fix some c++ warnings.

Guenther

Modified:
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   branches/SAMBA_3_0/source/utils/net_lookup.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c  2006-10-19 15:47:19 UTC (rev 
19415)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c  2006-10-19 21:47:11 UTC (rev 
19416)
@@ -216,7 +216,7 @@
                return ret;
        }
        
-       ret = krb5_string_to_key_salt(context, enctype, password->data, salt, 
key);
+       ret = krb5_string_to_key_salt(context, enctype, (const char 
*)password->data, salt, key);
        krb5_free_salt(context, salt);
        return ret;
 }
@@ -735,7 +735,7 @@
        static krb5_data kdata;
 
        kdata.data = (char *)krb5_principal_get_comp_string(context, principal, 
i);
-       kdata.length = strlen(kdata.data);
+       kdata.length = strlen((const char *)kdata.data);
        return &kdata;
 }
 #endif

Modified: branches/SAMBA_3_0/source/utils/net_lookup.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_lookup.c        2006-10-19 15:47:19 UTC 
(rev 19415)
+++ branches/SAMBA_3_0/source/utils/net_lookup.c        2006-10-19 21:47:11 UTC 
(rev 19416)
@@ -215,7 +215,7 @@
                realm.length = strlen(argv[0]);
        } else if (lp_realm() && *lp_realm()) {
                realm.data = lp_realm();
-               realm.length = strlen(realm.data);
+               realm.length = strlen((const char *)realm.data);
        } else {
                rc = krb5_get_host_realm(ctx, NULL, &realms);
                if (rc) {
@@ -224,7 +224,7 @@
                        return -1;
                }
                realm.data = (char *) *realms;
-               realm.length = strlen(realm.data);
+               realm.length = strlen((const char *)realm.data);
        }
 
        rc = krb5_locate_kdc(ctx, &realm, (struct sockaddr **)(void *)&addrs, 
&num_kdcs, 0);

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r19416 - in branches/SAMBA_3_0/source: libsmb utils, gd <=