svn commit: lorikeet r48 - in trunk/heimdal/lib/hdb: .

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-06 02:56:49 + (Mon, 06 Sep 2004)
New Revision: 48

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib/hdb&rev=48&nolog=1

Log:
Fix valgrind errors by simply allocating the enctypes[] array.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/hdb/keys.c


Changeset:
Modified: trunk/heimdal/lib/hdb/keys.c
===
--- trunk/heimdal/lib/hdb/keys.c2004-09-06 02:55:59 UTC (rev 47)
+++ trunk/heimdal/lib/hdb/keys.c2004-09-06 02:56:49 UTC (rev 48)
@@ -78,7 +78,6 @@
 char buf[3][256];
 int num_buf = 0;
 int i;
-static krb5_enctype e; /* XXX */
 krb5_error_code ret;
 
 /* the 3 DES types must be first */
@@ -112,18 +111,21 @@
/* XXX there should be a string_to_etypes handling
   special cases like `des' and `all' */
if(strcmp(buf[i], "des") == 0) {
-   *enctypes = all_etypes;
+   *enctypes = malloc(sizeof(all_etypes[0])*3);
+   memcpy(*enctypes, all_etypes, sizeof(all_etypes[0])*3);
*num_enctypes = 3;
continue;
} else if(strcmp(buf[i], "des3") == 0) {
-   e = ETYPE_DES3_CBC_SHA1;
-   *enctypes = &e;
+   *enctypes = malloc(sizeof(**enctypes));
+   *enctypes[0] = ETYPE_DES3_CBC_SHA1;
*num_enctypes = 1;
continue;
} else {
+   krb5_enctype e;
ret = krb5_string_to_enctype(context, buf[i], &e);
if (ret == 0) {
-   *enctypes = &e;
+   *enctypes = malloc(sizeof(**enctypes));
+   *enctypes[0] = e;
*num_enctypes = 1;
continue;
}
@@ -137,13 +139,15 @@
   interface sucks */
if(strcmp(buf[i], "pw-salt") == 0) {
if(*enctypes == NULL) {
-   *enctypes = all_etypes;
+   *enctypes = malloc(sizeof(all_etypes));
+   memcpy(*enctypes, all_etypes, sizeof(all_etypes));
*num_enctypes = sizeof(all_etypes)/sizeof(all_etypes[0]);
}
salt->salttype = KRB5_PW_SALT;
} else if(strcmp(buf[i], "afs3-salt") == 0) {
if(*enctypes == NULL) {
-   *enctypes = all_etypes;
+   *enctypes = malloc(sizeof(all_etypes[0])*3);
+   memcpy(*enctypes, all_etypes, sizeof(all_etypes[0])*3);
*num_enctypes = 3;
}
salt->salttype = KRB5_AFS3_SALT;
@@ -172,6 +176,7 @@
if(salt->saltvalue.data == NULL) {
krb5_set_error_string(context, "out of memory while "
  "parsing salt specifiers");
+   free(*enctypes);
return ENOMEM;
}
strlwr(salt->saltvalue.data);
@@ -313,10 +318,13 @@
if (j == *nkeyset) {
ret = add_enctype_to_key_set(&key_set, nkeyset, enctypes[i], 
 no_salt ? NULL : &salt);
-   if (ret)
-   goto out;
+   if (ret) {
+   free(enctypes);
+   goto out;
+   }
}
}
+   free(enctypes);
 }
 
  out:



svn commit: lorikeet r47 - in trunk/heimdal: .

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-06 02:55:59 + (Mon, 06 Sep 2004)
New Revision: 47

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal&rev=47&nolog=1

Log:
If we don't link with OpenSSL, we need to bring -ldl in ourselves.

Andrew Bartlett

Modified:
   trunk/heimdal/configure.in


Changeset:
Modified: trunk/heimdal/configure.in
===
--- trunk/heimdal/configure.in  2004-09-06 02:55:06 UTC (rev 46)
+++ trunk/heimdal/configure.in  2004-09-06 02:55:59 UTC (rev 47)
@@ -51,6 +51,9 @@
 
 rk_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast 
-Wmissing-declarations -Wnested-externs)
 
+# we need dlopen
+AC_SEARCH_LIBS(dlopen, [dl])
+
 rk_TEST_PACKAGE(openldap,
 [#include 
 #include ],



svn commit: lorikeet r46 - in trunk/heimdal/lib/krb5: .

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-06 02:55:06 + (Mon, 06 Sep 2004)
New Revision: 46

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib/krb5&rev=46&nolog=1

Log:
Adding uninitialised memory into the entorpy pool is a sure-fire way
to get valgrind errors.

(This didn't fix all of them - OpenSSL is still a problem - but it's a
start).

Andrew Bartlett

Modified:
   trunk/heimdal/lib/krb5/crypto.c


Changeset:
Modified: trunk/heimdal/lib/krb5/crypto.c
===
--- trunk/heimdal/lib/krb5/crypto.c 2004-09-06 02:53:38 UTC (rev 45)
+++ trunk/heimdal/lib/krb5/crypto.c 2004-09-06 02:55:06 UTC (rev 46)
@@ -3724,6 +3724,7 @@
 seed_something(void)
 {
 int fd = -1;
+size_t bytes;
 char buf[1024], seedfile[256];
 
 /* If there is a seed file, load it. But such a file cannot be trusted,
@@ -3731,9 +3732,13 @@
 if (RAND_file_name(seedfile, sizeof(seedfile))) {
fd = open(seedfile, O_RDONLY);
if (fd >= 0) {
-   read(fd, buf, sizeof(buf));
-   /* Use the full buffer anyway */
-   RAND_add(buf, sizeof(buf), 0.0);
+   bytes = read(fd, buf, sizeof(buf));
+   if (bytes > 0) {
+   RAND_add(buf, bytes, 0.0);
+   } else {
+   seedfile[0] = '\0';
+   }
+   close(fd);
} else
seedfile[0] = '\0';
 } else



svn commit: lorikeet r45 - in trunk/heimdal/lib/des: .

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-06 02:53:38 + (Mon, 06 Sep 2004)
New Revision: 45

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib/des&rev=45&nolog=1

Log:
Read /dev/urandom first, as this will not block and will always return bytes.

Don't read /dev/mem - that idea just gives me the willies...

Andrew Bartlett

Modified:
   trunk/heimdal/lib/des/rnd_keys.c


Changeset:
Modified: trunk/heimdal/lib/des/rnd_keys.c
===
--- trunk/heimdal/lib/des/rnd_keys.c2004-09-06 02:45:23 UTC (rev 44)
+++ trunk/heimdal/lib/des/rnd_keys.c2004-09-06 02:53:38 UTC (rev 45)
@@ -249,10 +249,10 @@
 RETSIGTYPE (*ochld)(int);
 pid_t pid;
 #endif
-char *rnd_devices[] = {"/dev/random",
+char *rnd_devices[] = {"/dev/urandom",
   "/dev/srandom",
-  "/dev/urandom",
   "/dev/arandom",
+  "/dev/random",
   NULL};
 char **p;
 
@@ -266,10 +266,6 @@
   close(fd);
 }
 
-/* Paranoia? Initialize data from /dev/mem if we can read it. */
-if (size >= 8)
-  sumFile("/dev/mem", (1024*1024*2), data);
-
 gdata = data;
 gsize = size;
 igdata = 0;



svn commit: lorikeet r44 - in trunk/heimdal/lib/hdb: .

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-06 02:45:23 + (Mon, 06 Sep 2004)
New Revision: 44

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib/hdb&rev=44&nolog=1

Log:
Do a 'fully qualified' search for the principal, by first searching
for the realm, then searching the subtree for the unqualified name.

Remove the hooks for 'get' and 'put' as these are unimplementated by
the LDAP backend, so there is no need to use them in LDB.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/hdb/hdb-ldb.c


Changeset:
Modified: trunk/heimdal/lib/hdb/hdb-ldb.c
===
--- trunk/heimdal/lib/hdb/hdb-ldb.c 2004-09-05 13:09:03 UTC (rev 43)
+++ trunk/heimdal/lib/hdb/hdb-ldb.c 2004-09-06 02:45:23 UTC (rev 44)
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999-2001, 2003, PADL Software Pty Ltd.
- * Copyright (c) 2004, Andrew Bartlett.
+ * Copyright (c) 2004, Andrew Bartlett <[EMAIL PROTECTED]>.
  * Copyright (c) 2004, Stefan Metzmacher <[EMAIL PROTECTED]>
  * All rights reserved.
  *
@@ -314,12 +314,24 @@
const char * const *princ_attrs = user_attrs;
char *p;
char *basedn = NULL;
+   char *realm;
+   char *realm_filter;
+   struct ldb_message **realm_msg;
 
+   const char *realm_attrs[] = {
+   "realm", 
+   NULL
+   };
+
princ = strdup(princname);
 
p = strchr(princ,'@');
if (p != NULL) {
p[0] = '\0';
+   realm = p+1;
+   } else {
+   ret = HDB_ERR_NOENTRY;
+   goto out;
}
 
p = strchr(princ,'/');
@@ -328,6 +340,33 @@
princ_attrs = service_attrs;
}
 
+   rc = asprintf(&realm_filter,
+   "(&(objectClass=domain)(realm=%s))",
+   realm);
+   if (rc < 0) {
+   krb5_set_error_string(context, "asprintf: out of memory");
+   ret = ENOMEM;
+   goto out;
+   }
+
+   count = ldb_search(ldb_ctx, NULL, LDB_SCOPE_SUBTREE, realm_filter, 
+  realm_attrs, &realm_msg);
+   if (count < 1) {
+   krb5_warnx(context, "ldb_search: filter: '%s' failed", realm_filter);
+   krb5_set_error_string(context, "ldb_search: filter: '%s' failed", 
realm_filter);
+   ret = HDB_ERR_NOENTRY;
+   goto out;
+   } else if (count > 1) {
+   krb5_warnx(context, "ldb_search: filter: '%s' more than 1 entry", 
realm_filter);
+   krb5_set_error_string(context, "ldb_search: filter: '%s' more than 1 
entry", realm_filter);
+   ret = HDB_ERR_NOENTRY;
+   goto out;   
+   }
+
+   basedn = realm_msg[0]->dn;
+
+   krb5_warnx(context, "LDB_lookup_principal: realm ok\n");
+
rc = asprintf(&filter,
"(&(objectClass=user)(%s=%s))",
princ_attr, princ);
@@ -357,6 +396,10 @@
 
ret = 0;
 out:
+   if (realm_msg) {
+   ldb_search_free(ldb_ctx, realm_msg);
+   }
+
if (filter) {
free(filter);
}
@@ -462,28 +505,6 @@
return 0;
 }
 
-static krb5_error_code LDB__get(krb5_context context, HDB *db, krb5_data key, 
krb5_data *reply)
-{
-   fprintf(stderr, "LDB__get not implemented\n");
-   abort();
-   return 0;
-}
-
-static krb5_error_code LDB__put(krb5_context context, HDB *db, int replace,
-   krb5_data key, krb5_data value)
-{
-   fprintf(stderr, "LDB__put not implemented\n");
-   abort();
-   return 0;
-}
-
-static krb5_error_code LDB__del(krb5_context context, HDB *db, krb5_data key)
-{
-   fprintf(stderr, "LDB__del not implemented\n");
-   abort();
-   return 0;
-}
-
 static krb5_error_code LDB_fetch(krb5_context context, HDB *db, unsigned flags,
hdb_entry *entry)
 {
@@ -657,10 +678,11 @@
(*db)->hdb_lock = LDB_lock;
(*db)->hdb_unlock = LDB_unlock;
(*db)->hdb_rename = LDB_rename;
-   /* can we ditch these? */
-   (*db)->hdb__get = LDB__get;
-   (*db)->hdb__put = LDB__put;
-   (*db)->hdb__del = LDB__del;
+   /* we don't implement these, as we are not a lockable database */
+   (*db)->hdb__get = NULL;
+   (*db)->hdb__put = NULL;
+   /* kadmin should not be used for deletes - use other tools instead */
+   (*db)->hdb__del = NULL;
(*db)->hdb_destroy = LDB_destroy;
 
return 0;



svn commit: samba r2232 - in trunk/source/lib: .

2004-09-05 Thread paulg
Author: paulg
Date: 2004-09-06 00:37:58 + (Mon, 06 Sep 2004)
New Revision: 2232

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/lib&rev=2232&nolog=1

Log:
Fix iconv.c to use the Samba-supplied uint8 type not the uint8_t type, which does not 
exist on all platforms.
Modified:
   trunk/source/lib/iconv.c


Changeset:
Modified: trunk/source/lib/iconv.c
===
--- trunk/source/lib/iconv.c2004-09-06 00:24:28 UTC (rev 2231)
+++ trunk/source/lib/iconv.c2004-09-06 00:37:58 UTC (rev 2232)
@@ -530,8 +530,8 @@
 char **outbuf, size_t *outbytesleft)
 {
size_t in_left=*inbytesleft, out_left=*outbytesleft;
-   const uint8_t *c = (const uint8_t *)*inbuf;
-   uint8_t *uc = (uint8_t *)*outbuf;
+   const uint8 *c = (const uint8 *)*inbuf;
+   uint8 *uc = (uint8 *)*outbuf;
 
while (in_left >= 1 && out_left >= 2) {
if ((c[0] & 0x80) == 0) {
@@ -647,8 +647,8 @@
char **outbuf, size_t *outbytesleft)
 {
size_t in_left=*inbytesleft, out_left=*outbytesleft;
-   uint8_t *c = (uint8_t *)*outbuf;
-   const uint8_t *uc = (const uint8_t *)*inbuf;
+   uint8 *c = (uint8 *)*outbuf;
+   const uint8 *uc = (const uint8 *)*inbuf;
 
while (in_left >= 2 && out_left >= 1) {
unsigned int codepoint;



svn commit: samba r2231 - in branches/SAMBA_3_0/source/lib: .

2004-09-05 Thread paulg
Author: paulg
Date: 2004-09-06 00:24:28 + (Mon, 06 Sep 2004)
New Revision: 2231

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/lib&rev=2231&nolog=1

Log:
Fix iconv.c to use the Samba-supplied uint8 type not the uint8_t type, which does not 
exist on all platforms.
Modified:
   branches/SAMBA_3_0/source/lib/iconv.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/iconv.c
===
--- branches/SAMBA_3_0/source/lib/iconv.c   2004-09-05 04:05:45 UTC (rev 2230)
+++ branches/SAMBA_3_0/source/lib/iconv.c   2004-09-06 00:24:28 UTC (rev 2231)
@@ -541,8 +541,8 @@
 char **outbuf, size_t *outbytesleft)
 {
size_t in_left=*inbytesleft, out_left=*outbytesleft;
-   const uint8_t *c = (const uint8_t *)*inbuf;
-   uint8_t *uc = (uint8_t *)*outbuf;
+   const uint8 *c = (const uint8 *)*inbuf;
+   uint8 *uc = (uint8 *)*outbuf;
 
while (in_left >= 1 && out_left >= 2) {
if ((c[0] & 0x80) == 0) {
@@ -658,8 +658,8 @@
char **outbuf, size_t *outbytesleft)
 {
size_t in_left=*inbytesleft, out_left=*outbytesleft;
-   uint8_t *c = (uint8_t *)*outbuf;
-   const uint8_t *uc = (const uint8_t *)*inbuf;
+   uint8 *c = (uint8 *)*outbuf;
+   const uint8 *uc = (const uint8 *)*inbuf;
 
while (in_left >= 2 && out_left >= 1) {
unsigned int codepoint;



svn commit: samba-docs r216 - in trunk: Samba-HOWTO-Collection xslt

2004-09-05 Thread jelmer
Author: jelmer
Date: 2004-09-05 16:14:06 + (Sun, 05 Sep 2004)
New Revision: 216

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=216&nolog=1

Log:
- Respect the scale= attribute. 
- Better conformance to the DocBook specs

Modified:
   trunk/Samba-HOWTO-Collection/CUPS-printing.xml
   trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml
   trunk/Samba-HOWTO-Collection/Passdb.xml
   trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml
   trunk/xslt/expand-sambadoc.xsl


Changeset:
Modified: trunk/Samba-HOWTO-Collection/CUPS-printing.xml
===
--- trunk/Samba-HOWTO-Collection/CUPS-printing.xml  2004-09-05 14:46:49 UTC (rev 
215)
+++ trunk/Samba-HOWTO-Collection/CUPS-printing.xml  2004-09-05 16:14:06 UTC (rev 
216)
@@ -1717,7 +1717,7 @@
PPDs shipped with CUPS


-   
+   
PPD filePrinter 
type

deskjet.ppdolder HP inkjet printers and 
compatible
@@ -2585,9 +2585,9 @@
 
 

-   cups.hlp
-   cupsdrvr.dll
-   cupsui.dll
+   cups.hlp
+   cupsdrvr.dll
+   cupsui.dll

 
 
@@ -2601,12 +2601,12 @@
 
 

-   ADFONTS.MFM
-   ADOBEPS4.DRV
-   ADOBEPS4.HLP
-   DEFPRTR2.PPD
-   ICONLIB.DLL
-   PSMON.DLL
+   ADFONTS.MFM
+   ADOBEPS4.DRV
+   ADOBEPS4.HLP
+   DEFPRTR2.PPD
+   ICONLIB.DLL
+   PSMON.DLL
 
 
 
@@ -2614,9 +2614,9 @@
 
 
 
-   ADOBEPS5.DLL
-   ADOBEPSU.DLL
-   ADOBEPSU.HLP
+   ADOBEPS5.DLL
+   ADOBEPSU.DLL
+   ADOBEPSU.HLP
 
 
 

Modified: trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml
===
--- trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml2004-09-05 14:46:49 UTC (rev 
215)
+++ trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml2004-09-05 16:14:06 UTC (rev 
216)
@@ -1559,7 +1559,7 @@



-   
+   
 

SubnetBrowse 
MasterList

Modified: trunk/Samba-HOWTO-Collection/Passdb.xml
===
--- trunk/Samba-HOWTO-Collection/Passdb.xml 2004-09-05 14:46:49 UTC (rev 215)
+++ trunk/Samba-HOWTO-Collection/Passdb.xml 2004-09-05 16:14:06 UTC (rev 216)
@@ -1413,8 +1413,8 @@

Possible ldap passwd sync 
values

-   
-   
+   
+   

ValueDescription


Modified: trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml
===
--- trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml   2004-09-05 14:46:49 UTC (rev 
215)
+++ trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml   2004-09-05 16:14:06 UTC (rev 
216)
@@ -332,7 +332,7 @@
 TDB File Descriptions
 

-   
+   

 
 

Modified: trunk/xslt/expand-sambadoc.xsl
===
--- trunk/xslt/expand-sambadoc.xsl  2004-09-05 14:46:49 UTC (rev 215)
+++ trunk/xslt/expand-sambadoc.xsl  2004-09-05 16:14:06 UTC (rev 216)
@@ -249,6 +249,10 @@


 
+   
+   
+   
+


50

@@ -262,7 +266,21 @@



images/.png
-   50
+   
+   
+   
+   
+   
+
+   
+   
+   
+
+   
+   
50
+  

svn commit: samba-docs r215 - in trunk: Samba-HOWTO-Collection xslt

2004-09-05 Thread jelmer
Author: jelmer
Date: 2004-09-05 14:46:49 + (Sun, 05 Sep 2004)
New Revision: 215

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=215&nolog=1

Log:
Better conformance to DocBook standards

Modified:
   trunk/Samba-HOWTO-Collection/Compiling.xml
   trunk/Samba-HOWTO-Collection/DomainMember.xml
   trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml
   trunk/Samba-HOWTO-Collection/PDC.xml
   trunk/Samba-HOWTO-Collection/Passdb.xml
   trunk/Samba-HOWTO-Collection/PolicyMgmt.xml
   trunk/Samba-HOWTO-Collection/ServerType.xml
   trunk/xslt/generate-attributions.xsl


Changeset:
Sorry, the patch is too large (288 lines) to include; please use WebSVN to see it!
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=215&nolog=1


svn commit: samba-docs r214 - in trunk: .

2004-09-05 Thread jelmer
Author: jelmer
Date: 2004-09-05 13:26:10 + (Sun, 05 Sep 2004)
New Revision: 214

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=214&nolog=1

Log:
Complain when when dia version is < 0.93 and $DISPLAY is not set

Modified:
   trunk/configure.in


Changeset:
Modified: trunk/configure.in
===
--- trunk/configure.in  2004-09-05 12:36:21 UTC (rev 213)
+++ trunk/configure.in  2004-09-05 13:26:10 UTC (rev 214)
@@ -41,6 +41,20 @@
 DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, ALL)
+
+# Check dia version number
+[ DIA_VERSION=`dia -v | egrep -o '([0-9]+)\.([0-9]+)'`]
+DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1`
+DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2`
+
+if test "$DIA_MAJ_VERSION" -le "0"
+then
+   if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" 
+   then
+   AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY 
or install Dia 0.93 or higher])
+   fi
+fi
+
 DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX)
 DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF)
 DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)



svn commit: lorikeet r43 - in trunk/heimdal/lib: hdb kadm5

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-05 13:09:03 + (Sun, 05 Sep 2004)
New Revision: 43

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib&rev=43&nolog=1

Log:
We now have unicodePwd working for the lorikeet-heimdal intergration.

This makes it much easier to setup, as we don't need to worry about
the NT hash, we can just ldbedit and put in an ascii password...

(now to see what lha thinks of my chainsaw effort ;-)

Andrew Bartlett

Added:
   trunk/heimdal/lib/hdb/keys.c
Modified:
   trunk/heimdal/lib/hdb/Makefile.am
   trunk/heimdal/lib/hdb/hdb-ldb.c
   trunk/heimdal/lib/hdb/hdb-protos.h
   trunk/heimdal/lib/kadm5/keys.c
   trunk/heimdal/lib/kadm5/set_keys.c


Changeset:
Sorry, the patch is too large (834 lines) to include; please use WebSVN to see it!
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib&rev=43&nolog=1


svn commit: samba-docs r213 - in trunk: . Samba-Guide/images Samba-HOWTO-Collection/images scripts

2004-09-05 Thread jelmer
Author: jelmer
Date: 2004-09-05 12:36:21 + (Sun, 05 Sep 2004)
New Revision: 213

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba-docs&path=/trunk&rev=213&nolog=1

Log:
Use dia to generate png images out of dia files

Added:
   trunk/Samba-HOWTO-Collection/images/browsing1.dia
Removed:
   trunk/Samba-Guide/images/AccountingNetwork.png
   trunk/Samba-Guide/images/Charity-Network.png
   trunk/Samba-Guide/images/UNIX-Samba-and-LDAP.png
   trunk/Samba-Guide/images/acct2net.png
   trunk/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
   trunk/Samba-Guide/images/ch7-dual-additive-LDAP.png
   trunk/Samba-Guide/images/ch7-fail-overLDAP.png
   trunk/Samba-Guide/images/ch7-singleLDAP.png
   trunk/Samba-Guide/images/ch8-migration.png
   trunk/Samba-Guide/images/chap4-net.png
   trunk/Samba-Guide/images/chap5-net.png
   trunk/Samba-Guide/images/chap6-net.png
   trunk/Samba-Guide/images/chap7-idresol.png
   trunk/Samba-Guide/images/chap7-net-A.png
   trunk/Samba-Guide/images/chap7-net.png
   trunk/Samba-Guide/images/chap7-net2-B.png
   trunk/Samba-Guide/images/chap7-net2.png
   trunk/Samba-Guide/images/chap9-ADSDC.png
   trunk/Samba-Guide/images/chap9-SambaDC.png
   trunk/Samba-HOWTO-Collection/images/access1.png
   trunk/Samba-HOWTO-Collection/images/browsing1
   trunk/Samba-HOWTO-Collection/images/browsing1.png
   trunk/Samba-HOWTO-Collection/images/cups1.png
   trunk/Samba-HOWTO-Collection/images/cups2.png
   trunk/Samba-HOWTO-Collection/images/domain.png
   trunk/Samba-HOWTO-Collection/images/idmap-gid2sid.png
   trunk/Samba-HOWTO-Collection/images/idmap-groups.png
   trunk/Samba-HOWTO-Collection/images/idmap-sid2gid.png
   trunk/Samba-HOWTO-Collection/images/idmap-sid2uid.png
   trunk/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
   trunk/Samba-HOWTO-Collection/images/idmap-uid2sid.png
   trunk/Samba-HOWTO-Collection/images/idmap.png
   trunk/Samba-HOWTO-Collection/images/pdftoepsonusb.png
   trunk/Samba-HOWTO-Collection/images/pdftosocket.png
   trunk/Samba-HOWTO-Collection/images/trusts1.png
Modified:
   trunk/Makefile.in
   trunk/configure.in
   trunk/scripts/copy-images.sh


Changeset:
Modified: trunk/Makefile.in
===
--- trunk/Makefile.in   2004-09-04 14:47:12 UTC (rev 212)
+++ trunk/Makefile.in   2004-09-05 12:36:21 UTC (rev 213)
@@ -12,6 +12,7 @@
 PNGTOPNM = @PNGTOPNM@
 EPSTOPNM = @EPSTOPNM@
 PNMTOPNG = @PNMTOPNG@
+DIA = @DIA@
 PNMTOPS = @PNMTOPS@
 HTML2TEXT = @HTML2TEXT@
 PLUCKERBUILD = @PLUCKERBUILD@
@@ -166,6 +167,7 @@
 
 # Adobe PDF files
 %.pdf: %.tex %.ind latexfigures 
+   $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append 
".png" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
-$(PDFLATEX) $<
$(THUMBPDF) $*.pdf
-$(PDFLATEX) $<
@@ -178,10 +180,10 @@
 %.dvi: %.tex %.idx 
$(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append 
".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
-$(LATEX) $< 
-   -$(LATEX) $< 
-   $(MAKEINDEX) $*.idx
-   -$(LATEX) $< 
 
+%.png: %.dia
+   $(DIA) -e $@ $<
+
 %.eps: %.png
$(PNGTOPNM) $< | $(PNMTOPS) > $@
 

Deleted: trunk/Samba-Guide/images/AccountingNetwork.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/Charity-Network.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/UNIX-Samba-and-LDAP.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/acct2net.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/ch7-dual-additive-LDAP.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/ch7-fail-overLDAP.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/ch7-singleLDAP.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/ch8-migration.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/chap4-net.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/chap5-net.png
===
(Binary files differ)

Deleted: trunk/Samba-Guide/images/chap6-net.png
===
(Binary files differ)

svn commit: lorikeet r42 - in trunk/heimdal: . admin appl appl/afsutil appl/dceutils appl/ftp appl/ftp/common appl/ftp/ftp appl/ftp/ftpd appl/kf appl/kx appl/login appl/otp appl/popper appl/push appl/rcp appl/rsh appl/su appl/telnet appl/telnet/libtelnet appl/telnet/telnet appl/telnet/telnetd appl/test appl/xnlock cf doc doc/standardisation include include/kadm5 kadmin kdc kpasswd kuser lib lib/45 lib/asn1 lib/auth lib/auth/afskauthlib lib/auth/pam lib/auth/sia lib/com_err lib/des lib/editline lib/gssapi lib/hdb lib/kadm5 lib/kafs lib/kdfs lib/krb5 lib/otp lib/roken lib/sl lib/vers tools

2004-09-05 Thread abartlet
Author: abartlet
Date: 2004-09-05 10:26:25 + (Sun, 05 Sep 2004)
New Revision: 42

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal&rev=42&nolog=1

Log:
Update Heimdal to snapshot 20040905.

Remove most autogenerated files from subversion (need to add ignore
stuff, when I figure out how it works).

Next step is allowing the unicodePwd to work.

Andrew Bartlett

Added:
   trunk/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-20.txt
   trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-referrals-04.txt
   trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-set-passwd-02.txt
   trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-ocsp-for-pkinit-00.txt
   trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-preauth-framework-01.txt
   trunk/heimdal/doc/standardisation/draft-raeburn-krb-rijndael-krb-07.txt
   trunk/heimdal/lib/krb5/acache.c
   trunk/heimdal/lib/krb5/krb5_eai_to_heim_errno.3
   trunk/heimdal/lib/krb5/krb5_eai_to_heim_errno.cat3
   trunk/heimdal/lib/krb5/krb5_get_credentials.3
   trunk/heimdal/lib/krb5/krb5_get_credentials.cat3
   trunk/heimdal/lib/krb5/krb5_get_forwarded_creds.3
   trunk/heimdal/lib/krb5/krb5_get_forwarded_creds.cat3
   trunk/heimdal/lib/krb5/krb5_getportbyname.3
   trunk/heimdal/lib/krb5/krb5_getportbyname.cat3
   trunk/heimdal/lib/krb5/krb5_rd_error.3
   trunk/heimdal/lib/krb5/krb5_rd_error.cat3
Removed:
   trunk/heimdal/Makefile.in
   trunk/heimdal/admin/Makefile.in
   trunk/heimdal/appl/Makefile.in
   trunk/heimdal/appl/afsutil/Makefile.in
   trunk/heimdal/appl/dceutils/Makefile.in
   trunk/heimdal/appl/ftp/Makefile.in
   trunk/heimdal/appl/ftp/common/Makefile.in
   trunk/heimdal/appl/ftp/ftp/Makefile.in
   trunk/heimdal/appl/ftp/ftpd/Makefile.in
   trunk/heimdal/appl/kf/Makefile.in
   trunk/heimdal/appl/kx/Makefile.in
   trunk/heimdal/appl/login/Makefile.in
   trunk/heimdal/appl/otp/Makefile.in
   trunk/heimdal/appl/popper/Makefile.in
   trunk/heimdal/appl/push/Makefile.in
   trunk/heimdal/appl/rcp/Makefile.in
   trunk/heimdal/appl/rsh/Makefile.in
   trunk/heimdal/appl/su/Makefile.in
   trunk/heimdal/appl/telnet/Makefile.in
   trunk/heimdal/appl/telnet/libtelnet/Makefile.in
   trunk/heimdal/appl/telnet/telnet/Makefile.in
   trunk/heimdal/appl/telnet/telnetd/Makefile.in
   trunk/heimdal/appl/test/Makefile.in
   trunk/heimdal/appl/xnlock/Makefile.in
   trunk/heimdal/cf/check-declaration.m4
   trunk/heimdal/configure
   trunk/heimdal/doc/Makefile.in
   trunk/heimdal/include/Makefile.in
   trunk/heimdal/include/config.h.in
   trunk/heimdal/include/kadm5/Makefile.in
   trunk/heimdal/kadmin/Makefile.in
   trunk/heimdal/kdc/Makefile.in
   trunk/heimdal/kpasswd/Makefile.in
   trunk/heimdal/kuser/Makefile.in
   trunk/heimdal/lib/45/Makefile.in
   trunk/heimdal/lib/Makefile.in
   trunk/heimdal/lib/asn1/Makefile.in
   trunk/heimdal/lib/auth/Makefile.in
   trunk/heimdal/lib/auth/afskauthlib/Makefile.in
   trunk/heimdal/lib/auth/pam/Makefile.in
   trunk/heimdal/lib/auth/sia/Makefile.in
   trunk/heimdal/lib/com_err/Makefile.in
   trunk/heimdal/lib/des/Makefile.in
   trunk/heimdal/lib/editline/Makefile.in
   trunk/heimdal/lib/gssapi/Makefile.in
   trunk/heimdal/lib/hdb/Makefile.in
   trunk/heimdal/lib/kadm5/Makefile.in
   trunk/heimdal/lib/kafs/Makefile.in
   trunk/heimdal/lib/kdfs/Makefile.in
   trunk/heimdal/lib/krb5/Makefile.in
   trunk/heimdal/lib/otp/Makefile.in
   trunk/heimdal/lib/roken/Makefile.in
   trunk/heimdal/lib/sl/Makefile.in
   trunk/heimdal/lib/vers/Makefile.in
   trunk/heimdal/tools/Makefile.in
Modified:
   trunk/heimdal/ChangeLog
   trunk/heimdal/aclocal.m4
   trunk/heimdal/admin/Makefile.am
   trunk/heimdal/appl/afsutil/ChangeLog
   trunk/heimdal/appl/afsutil/Makefile.am
   trunk/heimdal/appl/afsutil/afslog.c
   trunk/heimdal/appl/afsutil/pagsh.c
   trunk/heimdal/appl/ftp/ChangeLog
   trunk/heimdal/appl/ftp/common/Makefile.am
   trunk/heimdal/appl/ftp/ftp/Makefile.am
   trunk/heimdal/appl/ftp/ftp/ftp.c
   trunk/heimdal/appl/ftp/ftp/main.c
   trunk/heimdal/appl/ftp/ftpd/Makefile.am
   trunk/heimdal/appl/ftp/ftpd/extern.h
   trunk/heimdal/appl/ftp/ftpd/ftpcmd.y
   trunk/heimdal/appl/ftp/ftpd/ftpd.8
   trunk/heimdal/appl/ftp/ftpd/ftpd.c
   trunk/heimdal/appl/ftp/ftpd/ftpd.cat8
   trunk/heimdal/appl/ftp/ftpd/ftpd_locl.h
   trunk/heimdal/appl/kx/Makefile.am
   trunk/heimdal/appl/login/Makefile.am
   trunk/heimdal/appl/login/login_protos.h
   trunk/heimdal/appl/otp/Makefile.am
   trunk/heimdal/appl/popper/ChangeLog
   trunk/heimdal/appl/popper/Makefile.am
   trunk/heimdal/appl/popper/popper.c
   trunk/heimdal/appl/push/Makefile.am
   trunk/heimdal/appl/rcp/Makefile.am
   trunk/heimdal/appl/rsh/Makefile.am
   trunk/heimdal/appl/su/Makefile.am
   trunk/heimdal/appl/telnet/libtelnet/Makefile.am
   trunk/heimdal/appl/telnet/telnet/Makefile.am
   trunk/heimdal/appl/telnet/telnet/telnet.c
   trunk/heimdal/appl/telnet/telnetd/Makefile.am
   trunk/heimdal/appl/telnet/telnetd/sys_term.c
   trunk/