diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-14 05:54:33 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-04-14 05:54:33 +0000 |
| commit | c43a86bb62e519c6d508887fe52d12accabce372 (patch) | |
| tree | e517e0b5f40eed92b8b3220268688b7a7c961f2e /source/utils/net_lookup.c | |
| parent | f903c10943c537f462037c1f841e9923d56145dd (diff) | |
| download | samba-c43a86bb62e519c6d508887fe52d12accabce372.tar.gz samba-c43a86bb62e519c6d508887fe52d12accabce372.tar.xz samba-c43a86bb62e519c6d508887fe52d12accabce372.zip | |
r6334: revert 3.0.15pre1 changes. roll back to 3.0.14.
Add in jra fix for bad SMB_ASSERT.
Redefine SMB_ASSERT to a single DEBUG()
when not using --with-developer
Diffstat (limited to 'source/utils/net_lookup.c')
| -rw-r--r-- | source/utils/net_lookup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/utils/net_lookup.c b/source/utils/net_lookup.c index 9ddfe625081..7e5f12da454 100644 --- a/source/utils/net_lookup.c +++ b/source/utils/net_lookup.c @@ -193,7 +193,7 @@ static int net_lookup_kdc(int argc, const char **argv) } if (argc>0) { - realm.data = CONST_DISCARD(krb5_pointer, argv[0]); + realm.data = (krb5_pointer) argv[0]; realm.length = strlen(argv[0]); } else if (lp_realm() && *lp_realm()) { realm.data = (krb5_pointer) lp_realm(); @@ -209,7 +209,7 @@ static int net_lookup_kdc(int argc, const char **argv) realm.length = strlen(realm.data); } - rc = krb5_locate_kdc(ctx, &realm, (struct sockaddr **) &addrs, &num_kdcs, 0); + rc = krb5_locate_kdc(ctx, &realm, &addrs, &num_kdcs, 0); if (rc) { DEBUG(1, ("krb5_locate_kdc failed (%s)\n", error_message(rc))); return -1; |