Re: svn commit: samba r23616 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/rpc_parse SAMBA_3_0/source/rpc_server SAMBA_3_0_25/source/include SAMBA_3_0_25/source/rpc_parse SAMBA_3_0_25/sourc
On 6/26/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: Log: Fix bugzilla #4719: must change password is not set from usrmgr.exe. Hmm, I seem to have broken the RPC-SAMBA3-GETUSERNAME test now. I lost my network connection for several hours, and now I'm going to bed. Since you're not releasing something based on this code, I'll fix it tomorrow. -- --- Jim McDonough Samba Team jmcd at samba dot org
Build status as of Wed Jun 27 00:00:01 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-26 00:00:27.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-27 00:01:40.0 + @@ -1,25 +1,25 @@ -Build status as of Tue Jun 26 00:00:02 2007 +Build status as of Wed Jun 27 00:00:01 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 33 7 0 +ccache 34 8 0 ctdb 0 0 0 distcc 2 0 0 -ldb 31 4 0 -libreplace 31 11 0 -lorikeet-heimdal 28 14 0 +ldb 33 3 0 +libreplace 32 10 0 +lorikeet-heimdal 29 14 0 pidl 17 3 0 ppp 14 9 0 python 0 0 0 -rsync33 11 0 +rsync34 12 0 samba0 0 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 30 23 8 -samba_3_033 16 0 -smb-build30 30 0 -talloc 33 9 0 -tdb 31 2 0 +samba4 31 25 12 +samba_3_034 32 0 +smb-build31 31 0 +talloc 34 8 0 +tdb 33 1 0
svn commit: samba r23620 - in branches: SAMBA_3_0/examples/VFS SAMBA_3_0/source/include SAMBA_3_0/source/modules SAMBA_3_0/source/rpc_server SAMBA_3_0/source/smbd SAMBA_3_0_26/examples/VFS SAMBA_3_0_2
Author: jra Date: 2007-06-26 22:49:10 + (Tue, 26 Jun 2007) New Revision: 23620 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23620 Log: Convert set_nt_acl to return NTSTATUS. Also fix the chown return to correctly return NT_STATUS_INVALID_OWNER if it should be disallowed. Matches better what W2K3R3 does. NFSv4 ACL module owners, please examine these changes. Jeremy. Modified: branches/SAMBA_3_0/examples/VFS/skel_opaque.c branches/SAMBA_3_0/examples/VFS/skel_transparent.c branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0/source/modules/nfs4_acls.c branches/SAMBA_3_0/source/modules/vfs_afsacl.c branches/SAMBA_3_0/source/modules/vfs_aixacl2.c branches/SAMBA_3_0/source/modules/vfs_cap.c branches/SAMBA_3_0/source/modules/vfs_catia.c branches/SAMBA_3_0/source/modules/vfs_default.c branches/SAMBA_3_0/source/modules/vfs_full_audit.c branches/SAMBA_3_0/source/modules/vfs_gpfs.c branches/SAMBA_3_0/source/modules/vfs_zfsacl.c branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/posix_acls.c branches/SAMBA_3_0_26/examples/VFS/skel_opaque.c branches/SAMBA_3_0_26/examples/VFS/skel_transparent.c branches/SAMBA_3_0_26/source/include/vfs.h branches/SAMBA_3_0_26/source/modules/nfs4_acls.c branches/SAMBA_3_0_26/source/modules/vfs_afsacl.c branches/SAMBA_3_0_26/source/modules/vfs_aixacl2.c branches/SAMBA_3_0_26/source/modules/vfs_cap.c branches/SAMBA_3_0_26/source/modules/vfs_catia.c branches/SAMBA_3_0_26/source/modules/vfs_default.c branches/SAMBA_3_0_26/source/modules/vfs_full_audit.c branches/SAMBA_3_0_26/source/modules/vfs_gpfs.c branches/SAMBA_3_0_26/source/modules/vfs_zfsacl.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_26/source/smbd/nttrans.c branches/SAMBA_3_0_26/source/smbd/posix_acls.c Changeset: Sorry, the patch is too large (1549 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23620
svn commit: samba r23619 - in branches/SAMBA_3_0/source/nsswitch: .
Author: jerry Date: 2007-06-26 21:22:01 + (Tue, 26 Jun 2007) New Revision: 23619 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23619 Log: Fix compile warning in fill_grent_mem() caused by mismatched counter size. Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_group.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_group.c === --- branches/SAMBA_3_0/source/nsswitch/winbindd_group.c 2007-06-26 20:36:23 UTC (rev 23618) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_group.c 2007-06-26 21:22:01 UTC (rev 23619) @@ -543,7 +543,7 @@ n_glist = 1; for ( i=0; i
svn commit: samba r23618 - in tags: .
Author: jerry Date: 2007-06-26 20:36:23 + (Tue, 26 Jun 2007) New Revision: 23618 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23618 Log: tagging 3.0.25b Added: tags/release-3-0-25b/ Changeset: Copied: tags/release-3-0-25b (from rev 23617, branches/SAMBA_3_0_RELEASE)
svn commit: samba-web r1129 - in trunk: . history
Author: jerry Date: 2007-06-26 20:35:53 + (Tue, 26 Jun 2007) New Revision: 1129 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1129 Log: announce 3.0.25b Added: trunk/history/samba-3.0.25b.html Modified: trunk/header_columns.html trunk/history/header_history.html trunk/history/samba-3.0.25a.html trunk/index.html Changeset: Modified: trunk/header_columns.html === --- trunk/header_columns.html 2007-06-11 17:50:58 UTC (rev 1128) +++ trunk/header_columns.html 2007-06-26 20:35:53 UTC (rev 1129) @@ -130,9 +130,9 @@ Current Stable Release -Samba 3.0.25a (gzipped) -Release Notes -Signature +Samba 3.0.25b (gzipped) +Release Notes +Signature Historical Modified: trunk/history/header_history.html === --- trunk/history/header_history.html 2007-06-11 17:50:58 UTC (rev 1128) +++ trunk/history/header_history.html 2007-06-26 20:35:53 UTC (rev 1129) @@ -77,6 +77,7 @@ Release Notes +samba-3.0.25b samba-3.0.25a samba-3.0.25 samba-3.0.24 Modified: trunk/history/samba-3.0.25a.html === --- trunk/history/samba-3.0.25a.html2007-06-11 17:50:58 UTC (rev 1128) +++ trunk/history/samba-3.0.25a.html2007-06-26 20:35:53 UTC (rev 1129) @@ -141,7 +141,7 @@ Please refer to the original Samba -3.0.25 Release Notes for more details of changes from previous releases. +3.0.25 Release Notes for more details regarding changes in previous releases. Added: trunk/history/samba-3.0.25b.html === --- trunk/history/samba-3.0.25b.html2007-06-11 17:50:58 UTC (rev 1128) +++ trunk/history/samba-3.0.25b.html2007-06-26 20:35:53 UTC (rev 1129) @@ -0,0 +1,149 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml";> + + +Samba - Release Notes Archive + + + + + Samba 3.0.25b Available for Download + + + + === + Release Notes for Samba 3.0.25b + June 26, 2007 + === + +This is the third production release of the Samba 3.0.25 code +base and is the version that servers should be run for for all +current bug fixes. + +Major bug fixes included in Samba 3.0.25b are: + + o Offline caching of files with Windows XP/Vista clients. + o Improper cleanup of expired or invalid byte range locks +on files. + o Crashes is idmap_ldap and idmap_rid. + + +Changes to 'net idmap dump' +=== + +A change in command line syntax and behavior was introduced in the +3.0.25 release series where the command + + $ net idmap dump /.../path/to/idmap.tdb + +would overwrite the tdb instead of dumping its contents to standard +output as was the case in releases prior to Samba 3.0.25. The +changed has been reverted in 3.0.25b and the semantics from 3.0.24 +and earlier releases have been restored. + + +## +Changes +### + +Changes since 3.0.25a +- + +o Jeremy Allison <[EMAIL PROTECTED]> +* BUG 4655: Fix client parsing bug in spoolss EnumPrinterDataEx(). +* Ensure that proper oplock break requests occur during file open + and performing internal checks for compatible open modes. +* Fix offline file caching with Windows XP/Vista clients. +* Coverity fixes. +* Ensure that winbindd reports the correct client connection + details in response to a SIGUSR2. +* Fix timespec_current() to return the correct nano-second time. +* Fix lock logic inconsistencies in tdb_traverse(). +* Remove restriction on string length for rpcclient commands. +* BUG 4683: Fix LSA crash bug. +* BUG 3204: Fix file descriptor leak in the parent winbindd when + child processes hang. +* Avoid calling rename_open_files() when the old and new names + are identical. +* BUG 4689: Fix bug in new change notify code caused by not + ignoring the max_params_return value and as a resulting + returning truncated names. +* Fix sync_file() to return NTSTATUS and return this on failure in + the write reply path. +* BUG 4678,4697: Fix token creation for clear text logins. +* BUG 4725: Don't crash when no eventlog names are defined in + smb.conf. +* Ensure we will always release any timeout handler on fsp close + or removal of oplock. + + +o Jacob Berkman <[EMAIL PROTECTED]> +* BUG 4566: Pass password data to krb5_prompter. + + +o Gerald (Jerry) Carter <[EMAIL PROTECTED]> +* BUG 4579: Fix "wbinfo -t" when running winbindd on a Samba DC. + + +o Guenther Deschner <[EMAIL PROTECTED]>
svn commit: samba r23617 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2007-06-26 20:27:19 + (Tue, 26 Jun 2007) New Revision: 23617 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23617 Log: fix typos Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 20:09:41 UTC (rev 23616) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 20:27:19 UTC (rev 23617) @@ -16,7 +16,7 @@ Changes to 'net idmap dump' +=== A change in command line syntax and behavior was introduced in the 3.0.25 release series where the command @@ -24,7 +24,7 @@ $ net idmap dump /.../path/to/idmap.tdb would overwrite the tdb instead of dumping its contents to standard -output as was the case in releases priro to Samba 3.0.25. The +output as was the case in releases prior to Samba 3.0.25. The changed has been reverted in 3.0.25b and the semantics from 3.0.24 and earlier releases have been restored.
svn commit: samba r23616 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/rpc_parse SAMBA_3_0/source/rpc_server SAMBA_3_0_25/source/include SAMBA_3_0_25/source/rpc_parse SAMBA_3_0_25/source/rp
Author: jmcd Date: 2007-06-26 20:09:41 + (Tue, 26 Jun 2007) New Revision: 23616 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23616 Log: Fix bugzilla #4719: must change password is not set from usrmgr.exe. This was only affecting the newer versions of usrmgr.exe, because they use a user_info_25 struct. The password is getting set separately inside that code, so the password last set time was getting set from the password change logic. We also were not parsing a number of fields (like logon hours) from the user_info_25. That should also be fixed. Modified: branches/SAMBA_3_0/source/include/rpc_samr.h branches/SAMBA_3_0/source/rpc_parse/parse_samr.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0/source/rpc_server/srv_samr_util.c branches/SAMBA_3_0_25/source/include/rpc_samr.h branches/SAMBA_3_0_25/source/rpc_parse/parse_samr.c branches/SAMBA_3_0_25/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0_25/source/rpc_server/srv_samr_util.c branches/SAMBA_3_0_26/source/include/rpc_samr.h branches/SAMBA_3_0_26/source/rpc_parse/parse_samr.c branches/SAMBA_3_0_26/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_samr_util.c Changeset: Sorry, the patch is too large (505 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23616
svn commit: samba r23615 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2007-06-26 19:33:47 + (Tue, 26 Jun 2007) New Revision: 23615 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23615 Log: adding a note about the 'net idmap dump' change Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 19:26:20 UTC (rev 23614) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 19:33:47 UTC (rev 23615) @@ -15,6 +15,20 @@ o Crashes is idmap_ldap and idmap_rid. +Changes to 'net idmap dump' +--- + +A change in command line syntax and behavior was introduced in the +3.0.25 release series where the command + + $ net idmap dump /.../path/to/idmap.tdb + +would overwrite the tdb instead of dumping its contents to standard +output as was the case in releases priro to Samba 3.0.25. The +changed has been reverted in 3.0.25b and the semantics from 3.0.24 +and earlier releases have been restored. + + ## Changes ###
svn commit: samba-docs r1130 - in trunk/manpages-3: .
Author: idra Date: 2007-06-26 19:29:31 + (Tue, 26 Jun 2007) New Revision: 1130 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1130 Log: Make the manpage reflect the command behavior Modified: trunk/manpages-3/net.8.xml Changeset: Modified: trunk/manpages-3/net.8.xml === --- trunk/manpages-3/net.8.xml 2007-06-26 17:50:20 UTC (rev 1129) +++ trunk/manpages-3/net.8.xml 2007-06-26 19:29:31 UTC (rev 1130) @@ -1166,10 +1166,11 @@ -IDMAP DUMP
svn commit: samba r23614 - in tags: .
Author: jerry Date: 2007-06-26 19:26:20 + (Tue, 26 Jun 2007) New Revision: 23614 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23614 Log: have to recut the tarball to removing the 3.0.25b release tag Removed: tags/release-3-0-25b/ Changeset:
svn commit: samba r23613 - in branches/SAMBA_3_0_RELEASE: . source/utils
Author: jerry
Date: 2007-06-26 19:23:07 + (Tue, 26 Jun 2007)
New Revision: 23613
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23613
Log:
pull in net idmap change from the 3.0.25 tree
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 19:15:26 UTC (rev
23612)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-06-26 19:23:07 UTC (rev
23613)
@@ -76,8 +76,10 @@
o Volker Lendecke <[EMAIL PROTECTED]>
* Fix record state check error when reviewing entries in nmbd's
WINS database.
+* Revert 'net idmap dump' behavior to 3.0.24 behavior to fix change
+ in command line syntax that would overwrite winbindd_idmap.tdb.
+
-
o Justin Maggard <[EMAIL PROTECTED]>
* Don't expire a password if it's explicitly set as ACB_PWNOTREQ.
Modified: branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c
===
--- branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c 2007-06-26 19:15:26 UTC
(rev 23612)
+++ branches/SAMBA_3_0_RELEASE/source/utils/net_idmap.c 2007-06-26 19:23:07 UTC
(rev 23613)
@@ -28,50 +28,51 @@
} } while(0)
/***
- Dump the current idmap
+ Helper function for net_idmap_dump. Dump one entry.
**/
-static int net_idmap_dump(int argc, const char **argv)
+static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
+ TDB_DATA key,
+ TDB_DATA data,
+ void *unused)
{
- TALLOC_CTX *ctx;
- char *filename;
-
- if (argc != 1) {
- return net_help_idmap(argc, argv);
+ if (strcmp(key.dptr, "USER HWM") == 0) {
+ printf("USER HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- if (! winbind_ping()) {
- d_fprintf(stderr, "To use net idmap Winbindd must be
running.\n");
- return -1;
+ if (strcmp(key.dptr, "GROUP HWM") == 0) {
+ printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- ctx = talloc_new(NULL);
- ALLOC_CHECK(ctx);
+ if (strncmp(key.dptr, "S-", 2) != 0)
+ return 0;
- filename = talloc_strdup(ctx, argv[0]);
- ALLOC_CHECK(filename);
+ printf("%s %s\n", data.dptr, key.dptr);
+ return 0;
+}
- /* filename must be absolute */
- if (*filename != '/') {
- char path[4096];
-
- filename = getcwd(path, 4095);
- if ( ! filename) {
- d_fprintf(stderr, "Failed to obtain full output file
path");
- talloc_free(ctx);
- return -1;
- }
+/***
+ Dump the current idmap
+ **/
+static int net_idmap_dump(int argc, const char **argv)
+{
+ TDB_CONTEXT *idmap_tdb;
- filename = talloc_asprintf(ctx, "%s/%s", path, argv[0]);
- ALLOC_CHECK(filename);
- }
+ if ( argc != 1 )
+ return net_help_idmap( argc, argv );
- if ( ! winbind_idmap_dump_maps(ctx, filename)) {
- d_fprintf(stderr, "Failed to obtain idmap data from
winbindd\n");
- talloc_free(ctx);
+ idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+
+ if (idmap_tdb == NULL) {
+ d_fprintf(stderr, "Could not open idmap: %s\n", argv[0]);
return -1;
}
- talloc_free(ctx);
+ tdb_traverse(idmap_tdb, net_idmap_dump_one_entry, NULL);
+
+ tdb_close(idmap_tdb);
+
return 0;
}
svn commit: samba r23612 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_25/source/utils SAMBA_3_0_26/source/utils
Author: vlendec
Date: 2007-06-26 19:15:26 + (Tue, 26 Jun 2007)
New Revision: 23612
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23612
Log:
Revert 'net idmap dump' to the 3.0.24 behaviour.
Modified:
branches/SAMBA_3_0/source/utils/net_idmap.c
branches/SAMBA_3_0_25/source/utils/net_idmap.c
branches/SAMBA_3_0_26/source/utils/net_idmap.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_idmap.c
===
--- branches/SAMBA_3_0/source/utils/net_idmap.c 2007-06-26 18:18:44 UTC (rev
23611)
+++ branches/SAMBA_3_0/source/utils/net_idmap.c 2007-06-26 19:15:26 UTC (rev
23612)
@@ -28,50 +28,51 @@
} } while(0)
/***
- Dump the current idmap
+ Helper function for net_idmap_dump. Dump one entry.
**/
-static int net_idmap_dump(int argc, const char **argv)
+static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
+ TDB_DATA key,
+ TDB_DATA data,
+ void *unused)
{
- TALLOC_CTX *ctx;
- char *filename;
-
- if (argc != 1) {
- return net_help_idmap(argc, argv);
+ if (strcmp((char *)key.dptr, "USER HWM") == 0) {
+ printf("USER HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- if (! winbind_ping()) {
- d_fprintf(stderr, "To use net idmap Winbindd must be
running.\n");
- return -1;
+ if (strcmp((char *)key.dptr, "GROUP HWM") == 0) {
+ printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- ctx = talloc_new(NULL);
- ALLOC_CHECK(ctx);
+ if (strncmp((char *)key.dptr, "S-", 2) != 0)
+ return 0;
- filename = talloc_strdup(ctx, argv[0]);
- ALLOC_CHECK(filename);
+ printf("%s %s\n", data.dptr, key.dptr);
+ return 0;
+}
- /* filename must be absolute */
- if (*filename != '/') {
- char path[4096];
-
- filename = getcwd(path, 4095);
- if ( ! filename) {
- d_fprintf(stderr, "Failed to obtain full output file
path");
- talloc_free(ctx);
- return -1;
- }
+/***
+ Dump the current idmap
+ **/
+static int net_idmap_dump(int argc, const char **argv)
+{
+ TDB_CONTEXT *idmap_tdb;
- filename = talloc_asprintf(ctx, "%s/%s", path, argv[0]);
- ALLOC_CHECK(filename);
- }
+ if ( argc != 1 )
+ return net_help_idmap( argc, argv );
- if ( ! winbind_idmap_dump_maps(ctx, filename)) {
- d_fprintf(stderr, "Failed to obtain idmap data from
winbindd\n");
- talloc_free(ctx);
+ idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+
+ if (idmap_tdb == NULL) {
+ d_fprintf(stderr, "Could not open idmap: %s\n", argv[0]);
return -1;
}
- talloc_free(ctx);
+ tdb_traverse(idmap_tdb, net_idmap_dump_one_entry, NULL);
+
+ tdb_close(idmap_tdb);
+
return 0;
}
Modified: branches/SAMBA_3_0_25/source/utils/net_idmap.c
===
--- branches/SAMBA_3_0_25/source/utils/net_idmap.c 2007-06-26 18:18:44 UTC
(rev 23611)
+++ branches/SAMBA_3_0_25/source/utils/net_idmap.c 2007-06-26 19:15:26 UTC
(rev 23612)
@@ -28,50 +28,51 @@
} } while(0)
/***
- Dump the current idmap
+ Helper function for net_idmap_dump. Dump one entry.
**/
-static int net_idmap_dump(int argc, const char **argv)
+static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
+ TDB_DATA key,
+ TDB_DATA data,
+ void *unused)
{
- TALLOC_CTX *ctx;
- char *filename;
-
- if (argc != 1) {
- return net_help_idmap(argc, argv);
+ if (strcmp(key.dptr, "USER HWM") == 0) {
+ printf("USER HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- if (! winbind_ping()) {
- d_fprintf(stderr, "To use net idmap Winbindd must be
running.\n");
- return -1;
+ if (strcmp(key.dptr, "GROUP HWM") == 0) {
+ printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+ return 0;
}
- ctx = talloc_new(NULL);
- ALLOC_CHECK(ctx);
+ if (strncmp(key.dptr, "S-", 2) != 0)
+ return 0;
- filename = talloc_strdup(ctx,
svn commit: samba r23611 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: jpeach
Date: 2007-06-26 18:18:44 + (Tue, 26 Jun 2007)
New Revision: 23611
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23611
Log:
Fix typo in error message.
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap_rid.c
branches/SAMBA_3_0_26/source/nsswitch/idmap_rid.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_rid.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap_rid.c 2007-06-26 13:45:07 UTC
(rev 23610)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_rid.c 2007-06-26 18:18:44 UTC
(rev 23611)
@@ -79,7 +79,7 @@
if (lp_idmap_gid(&low_gid, &high_gid)) {
if ((ctx->low_id != low_gid) ||
(ctx->high_id != high_uid)) {
- DEBUG(1, ("ERROR: idmap uid irange must match
idmap gid range\n"));
+ DEBUG(1, ("ERROR: idmap uid range must match
idmap gid range\n"));
ret = NT_STATUS_UNSUCCESSFUL;
goto failed;
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/idmap_rid.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/idmap_rid.c 2007-06-26 13:45:07 UTC
(rev 23610)
+++ branches/SAMBA_3_0_26/source/nsswitch/idmap_rid.c 2007-06-26 18:18:44 UTC
(rev 23611)
@@ -79,7 +79,7 @@
if (lp_idmap_gid(&low_gid, &high_gid)) {
if ((ctx->low_id != low_gid) ||
(ctx->high_id != high_uid)) {
- DEBUG(1, ("ERROR: idmap uid irange must match
idmap gid range\n"));
+ DEBUG(1, ("ERROR: idmap uid range must match
idmap gid range\n"));
ret = NT_STATUS_UNSUCCESSFUL;
goto failed;
}
Re: svn commit: samba r23558 - in branches/SAMBA_4_0/testprogs/ejs: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: > Author: abartlet > Date: 2007-06-21 05:14:13 + (Thu, 21 Jun 2007) > New Revision: 23558 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23558 > > Log: > MMC seems to ask for this, so I think we need to include it in our schema. > > Andrew Bartlett > > Modified: >branches/SAMBA_4_0/testprogs/ejs/minschema.js > > > Changeset: > Modified: branches/SAMBA_4_0/testprogs/ejs/minschema.js > === > --- branches/SAMBA_4_0/testprogs/ejs/minschema.js 2007-06-21 01:28:33 UTC > (rev 23557) > +++ branches/SAMBA_4_0/testprogs/ejs/minschema.js 2007-06-21 05:14:13 UTC > (rev 23558) > @@ -73,6 +73,7 @@ > "subClassOf", > "governsID", > "possSuperiors", > +"possibleInferiors", this attribute is constructed and we should generate it instead of store it... metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGgVQLm70gjA5TCD8RAkaIAKCgkPE3U8E/eQ93PXJM3onKWxABnACg0mLx iEQ/+7wVOBr+HFrH8PSL+R8= =JTDS -END PGP SIGNATURE-
svn commit: samba-docs r1129 - in trunk/smbdotconf/security: .
Author: jpeach Date: 2007-06-26 17:50:20 + (Tue, 26 Jun 2007) New Revision: 1129 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1129 Log: Double-up on some backslashes so they don't get interpreted by nroff. Modified: trunk/smbdotconf/security/passwdchat.xml trunk/smbdotconf/security/restrictanonymous.xml Changeset: Modified: trunk/smbdotconf/security/passwdchat.xml === --- trunk/smbdotconf/security/passwdchat.xml2007-06-26 08:11:40 UTC (rev 1128) +++ trunk/smbdotconf/security/passwdchat.xml2007-06-26 17:50:20 UTC (rev 1129) @@ -30,7 +30,7 @@ The string can contain the macro %n which is substituted for the new password. The chat sequence can also contain the standard -macros \n, \r, \t and \s to +macros \\n, \\r, \\t and \\s to give line-feed, carriage-return, tab and space. The chat sequence string can also contain a '*' which matches any sequence of characters. Double quotes can be used to collect strings with spaces in them into a single string. @@ -41,7 +41,7 @@ If the parameter is set to yes, the chat pairs may be matched in any order, and success is determined by the PAM result, not any particular - output. The \n macro is ignored for PAM conversions. + output. The \\n macro is ignored for PAM conversions. Modified: trunk/smbdotconf/security/restrictanonymous.xml === --- trunk/smbdotconf/security/restrictanonymous.xml 2007-06-26 08:11:40 UTC (rev 1128) +++ trunk/smbdotconf/security/restrictanonymous.xml 2007-06-26 17:50:20 UTC (rev 1129) @@ -8,8 +8,8 @@ group list information is returned for an anonymous connection. and mirrors the effects of the -HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\ - Control\LSA\RestrictAnonymous +HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\ + Control\\LSA\\RestrictAnonymous registry key in Windows 2000 and Windows NT. When set to 0, user and group list information is returned to anyone who asks. When set
svn commit: lorikeet r764 - in trunk/heimdal/tests: . kdc
Author: lha
Date: 2007-06-26 15:21:53 + (Tue, 26 Jun 2007)
New Revision: 764
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=764
Log:
Merged with Heimdal svn revision 21349
Modified:
trunk/heimdal/tests/ChangeLog
trunk/heimdal/tests/kdc/check-pkinit.in
Changeset:
Modified: trunk/heimdal/tests/ChangeLog
===
--- trunk/heimdal/tests/ChangeLog 2007-06-26 14:27:06 UTC (rev 763)
+++ trunk/heimdal/tests/ChangeLog 2007-06-26 15:21:53 UTC (rev 764)
@@ -1,5 +1,7 @@
2007-06-26 Love H�rnquist �strand <[EMAIL PROTECTED]>
+ * kdc/check-pkinit.in: Fix hxtool issue-certificate --req.
+
* kdc/check-referral.in: Spelling.
2007-06-22 Love H�rnquist �strand <[EMAIL PROTECTED]>
Modified: trunk/heimdal/tests/kdc/check-pkinit.in
===
--- trunk/heimdal/tests/kdc/check-pkinit.in 2007-06-26 14:27:06 UTC (rev
763)
+++ trunk/heimdal/tests/kdc/check-pkinit.in 2007-06-26 15:21:53 UTC (rev
764)
@@ -31,7 +31,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: check-pkinit.in 20749 2007-05-31 17:34:17Z lha $
+# $Id: check-pkinit.in 21348 2007-06-26 15:12:59Z lha $
#
srcdir="@srcdir@"
@@ -130,7 +130,7 @@
--ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
--type="pkinit-kdc" \
--pk-init-principal="krbtgt/[EMAIL PROTECTED]" \
- --req="req-kdc.der" \
+ --req="PKCS10:req-kdc.der" \
--certificate="FILE:kdc.crt" || exit 1
echo "issue user certificate (pkinit san)"
@@ -138,14 +138,14 @@
--ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
--type="pkinit-client" \
--pk-init-principal="[EMAIL PROTECTED]" \
- --req="req-pkinit.der" \
+ --req="PKCS10:req-pkinit.der" \
--certificate="FILE:pkinit.crt" || exit 1
echo "issue user 2 certificate (no san)"
${hxtool} issue-certificate \
--ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
--type="pkinit-client" \
- --req="req-pkinit2.der" \
+ --req="PKCS10:req-pkinit2.der" \
--certificate="FILE:pkinit2.crt" || exit 1
echo "issue user 3 certificate (ms san)"
@@ -153,7 +153,7 @@
--ca-certificate=FILE:$objdir/ca.crt,${keyfile} \
--type="pkinit-client" \
--ms-upn="[EMAIL PROTECTED]" \
- --req="req-pkinit2.der" \
+ --req="PKCS10:req-pkinit2.der" \
--certificate="FILE:pkinit3.crt" || exit 1
svn commit: lorikeet r763 - in trunk/heimdal/lib/hx509: .
Author: lha Date: 2007-06-26 14:27:06 + (Tue, 26 Jun 2007) New Revision: 763 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=763 Log: Merged with Heimdal svn revision 21347 Modified: trunk/heimdal/lib/hx509/ChangeLog trunk/heimdal/lib/hx509/hxtool-commands.in trunk/heimdal/lib/hx509/hxtool.c trunk/heimdal/lib/hx509/req.c trunk/heimdal/lib/hx509/test_ca.in trunk/heimdal/lib/hx509/test_req.in trunk/heimdal/lib/hx509/version-script.map Changeset: Sorry, the patch is too large (506 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=763
svn commit: samba r23610 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/lib SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-06-26 13:45:07 + (Tue, 26 Jun 2007)
New Revision: 23610
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23610
Log:
Move some winbindd_cache specific flags and actions
back to winbindd_cache.c. The generic mechanism
should open the cache tdb readonly and with default
flags.
Michael
Modified:
branches/SAMBA_3_0/source/lib/util_tdb.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_26/source/lib/util_tdb.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_tdb.c
===
--- branches/SAMBA_3_0/source/lib/util_tdb.c2007-06-26 10:19:06 UTC (rev
23609)
+++ branches/SAMBA_3_0/source/lib/util_tdb.c2007-06-26 13:45:07 UTC (rev
23610)
@@ -1005,12 +1005,7 @@
v_status.unknown_key = False;
v_status.success = True;
- tdb = tdb_open_log(tdb_path,
- WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- lp_winbind_offline_logon()
- ? TDB_DEFAULT
- : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
- O_RDWR|O_CREAT, 0600);
+ tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDONLY, 0);
if (!tdb) {
v_status.tdb_error = True;
v_status.success = False;
@@ -1182,4 +1177,3 @@
return ret;
}
-
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-26 10:19:06 UTC
(rev 23609)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-26 13:45:07 UTC
(rev 23610)
@@ -3279,14 +3279,32 @@
int winbindd_validate_cache(void)
{
- int ret;
+ int ret = -1;
+ const char *tdb_path = lock_path("winbindd_cache.tdb");
+ TDB_CONTEXT *tdb = NULL;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic;
+
+ tdb = tdb_open_log(tdb_path,
+ WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
+ ( lp_winbind_offline_logon()
+? TDB_DEFAULT
+: TDB_DEFAULT | TDB_CLEAR_IF_FIRST ),
+ O_RDWR|O_CREAT,
+ 0600);
+ if (!tdb) {
+ DEBUG(0, ("winbindd_validate_cache: "
+ "error opening/initializing tdb\n"));
+ goto done;
+ }
+ tdb_close(tdb);
+
ret = tdb_validate(lock_path("winbindd_cache.tdb"),
cache_traverse_validate_fn);
+done:
DEBUG(10, ("winbindd_validate_cache: restoring panic function\n"));
smb_panic_fn = smb_panic;
return ret;
Modified: branches/SAMBA_3_0_26/source/lib/util_tdb.c
===
--- branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-06-26 10:19:06 UTC (rev
23609)
+++ branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-06-26 13:45:07 UTC (rev
23610)
@@ -1005,12 +1005,7 @@
v_status.unknown_key = False;
v_status.success = True;
- tdb = tdb_open_log(tdb_path,
- WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- lp_winbind_offline_logon()
- ? TDB_DEFAULT
- : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
- O_RDWR|O_CREAT, 0600);
+ tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDONLY, 0);
if (!tdb) {
v_status.tdb_error = True;
v_status.success = False;
@@ -1182,4 +1177,3 @@
return ret;
}
-
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-26
10:19:06 UTC (rev 23609)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-26
13:45:07 UTC (rev 23610)
@@ -3279,14 +3279,32 @@
int winbindd_validate_cache(void)
{
- int ret;
+ int ret = -1;
+ const char *tdb_path = lock_path("winbindd_cache.tdb");
+ TDB_CONTEXT *tdb = NULL;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic;
+
+ tdb = tdb_open_log(tdb_path,
+ WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
+ ( lp_winbind_offline_logon()
+? TDB_DEFAULT
+: TDB_DEFAULT | TDB_CLEAR_IF_FIRST ),
+ O_RDWR|O_CREAT,
+ 0600);
+ if (!tdb) {
+ DEBUG(0, ("winbindd_validate_cache: "
+ "error opening/initializing t
svn commit: lorikeet r762 - in trunk/heimdal/lib/hx509: .
Author: lha
Date: 2007-06-26 12:45:44 + (Tue, 26 Jun 2007)
New Revision: 762
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=762
Log:
Merged with Heimdal svn revision 21340
Modified:
trunk/heimdal/lib/hx509/ChangeLog
trunk/heimdal/lib/hx509/hxtool.c
trunk/heimdal/lib/hx509/req.c
trunk/heimdal/lib/hx509/version-script.map
Changeset:
Modified: trunk/heimdal/lib/hx509/ChangeLog
===
--- trunk/heimdal/lib/hx509/ChangeLog 2007-06-26 12:12:22 UTC (rev 761)
+++ trunk/heimdal/lib/hx509/ChangeLog 2007-06-26 12:45:44 UTC (rev 762)
@@ -1,5 +1,11 @@
2007-06-26 Love H�rnquist �strand <[EMAIL PROTECTED]>
+ * version-script.map: Add initialize_hx_error_table_r.
+
+ * req.c: Move _hx509_request_print here.
+
+ * hxtool.c: use _hx509_request_print
+
* version-script.map: Export more crap^W semiprivate functions.
* hxtool.c: don't _hx509_abort
Modified: trunk/heimdal/lib/hx509/hxtool.c
===
--- trunk/heimdal/lib/hx509/hxtool.c2007-06-26 12:12:22 UTC (rev 761)
+++ trunk/heimdal/lib/hx509/hxtool.c2007-06-26 12:45:44 UTC (rev 762)
@@ -32,7 +32,7 @@
*/
#include "hx_locl.h"
-RCSID("$Id: hxtool.c 21330 2007-06-26 11:09:55Z lha $");
+RCSID("$Id: hxtool.c 21338 2007-06-26 12:40:56Z lha $");
#include
#include
@@ -1204,58 +1204,21 @@
int
pkcs10_print(struct pkcs10_print_options *opt, int argc, char **argv)
{
-size_t size, length;
+size_t length;
int ret, i;
void *p;
printf("pkcs10 print\n");
for (i = 0; i < argc; i++) {
- CertificationRequest req;
- CertificationRequestInfo *rinfo;
-
ret = _hx509_map_file(argv[i], &p, &length, NULL);
if (ret)
err(1, "map_file: %s: %d", argv[i], ret);
- ret = decode_CertificationRequest(p, length, &req, &size);
+ ret = _hx509_request_print(context, stdout, p, length);
_hx509_unmap_file(p, length);
if (ret)
- errx(1, "failed to parse file %s: %d", argv[i], ret);
-
- rinfo = &req.certificationRequestInfo;
-
- {
- char *subject;
- hx509_name n;
-
- ret = _hx509_name_from_Name(&rinfo->subject, &n);
- if (ret)
- abort();
-
- ret = hx509_name_to_string(n, &subject);
- hx509_name_free(&n);
- if (ret)
- abort();
-
- printf("name: %s\n", subject);
- free(subject);
- }
-
- if (rinfo->attributes && rinfo->attributes->len) {
- int j;
-
- printf("Attributes:\n");
-
- for (j = 0; j < rinfo->attributes->len; j++) {
- char *str;
- hx509_oid_sprint(&rinfo->attributes->val[j].type, &str);
- printf("\toid: %s\n", str);
- free(str);
- }
- }
-
- free_CertificationRequest(&req);
+ hx509_err(context, 1, ret, "Failed to print file %s", argv[ i]);
}
return 0;
Modified: trunk/heimdal/lib/hx509/req.c
===
--- trunk/heimdal/lib/hx509/req.c 2007-06-26 12:12:22 UTC (rev 761)
+++ trunk/heimdal/lib/hx509/req.c 2007-06-26 12:45:44 UTC (rev 762)
@@ -33,7 +33,7 @@
#include "hx_locl.h"
#include
-RCSID("$Id: req.c 20934 2007-06-06 15:30:02Z lha $");
+RCSID("$Id: req.c 21335 2007-06-26 12:18:33Z lha $");
struct hx509_request_data {
hx509_name name;
@@ -215,3 +215,58 @@
return ret;
}
+
+int
+_hx509_request_print(hx509_context context, FILE *f, const void *data, size_t
len)
+{
+CertificationRequest req;
+CertificationRequestInfo *rinfo;
+size_t size;
+int ret;
+
+ret = decode_CertificationRequest(data, len, &req, &size);
+if (ret) {
+ hx509_set_error_string(context, 0, ret, "Failed to decode request");
+ return ret;
+}
+
+rinfo = &req.certificationRequestInfo;
+
+{
+ char *subject;
+ hx509_name n;
+
+ ret = _hx509_name_from_Name(&rinfo->subject, &n);
+ if (ret) {
+ hx509_set_error_string(context, 0, ret, "Failed to extract name");
+ free_CertificationRequest(&req);
+ return ret;
+ }
+ ret = hx509_name_to_string(n, &subject);
+ hx509_name_free(&n);
+ if (ret) {
+ hx509_set_error_string(context, 0, ret, "Failed to print name");
+ free_CertificationRequest(&req);
+ return ret;
+ }
+
+ fprintf(f, "name: %s\n", subject);
+ free(subject);
+}
+
+if (rinfo->attributes && rinfo->attributes->len) {
+ int j;
+
+ fprintf(f, "Attributes:\n");
+
+ for (j = 0; j < rinfo->attributes->len; j++) {
+ char *str;
+ hx509_oid_sprint(&rinfo->attributes->val[j].type, &str);
+ fp
svn commit: lorikeet r761 - in trunk/heimdal/lib/hx509: .
Author: lha Date: 2007-06-26 12:12:22 + (Tue, 26 Jun 2007) New Revision: 761 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=761 Log: Merged with Heimdal svn revision 21333 Modified: trunk/heimdal/lib/hx509/version-script.map Changeset: Modified: trunk/heimdal/lib/hx509/version-script.map === --- trunk/heimdal/lib/hx509/version-script.map 2007-06-26 11:15:08 UTC (rev 760) +++ trunk/heimdal/lib/hx509/version-script.map 2007-06-26 12:12:22 UTC (rev 761) @@ -194,6 +194,8 @@ _hx509_certs_keys_free; _hx509_certs_keys_get; _hx509_request_init; + _hx509_request_add_dns_name; + _hx509_request_add_email; _hx509_request_set_name; _hx509_request_set_email; _hx509_request_set_SubjectPublicKeyInfo;
svn commit: lorikeet r760 - in trunk/heimdal: . lib/hx509 lib/krb5
Author: lha
Date: 2007-06-26 11:15:08 + (Tue, 26 Jun 2007)
New Revision: 760
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=760
Log:
Merged with Heimdal svn revision 21332
Modified:
trunk/heimdal/ChangeLog
trunk/heimdal/lib/hx509/ChangeLog
trunk/heimdal/lib/hx509/hxtool.c
trunk/heimdal/lib/hx509/version-script.map
trunk/heimdal/lib/krb5/get_cred.c
trunk/heimdal/lib/krb5/krb5_get_credentials.3
Changeset:
Modified: trunk/heimdal/ChangeLog
===
--- trunk/heimdal/ChangeLog 2007-06-26 10:27:40 UTC (rev 759)
+++ trunk/heimdal/ChangeLog 2007-06-26 11:15:08 UTC (rev 760)
@@ -1,3 +1,11 @@
+2007-06-26 Love H�rnquist �strand <[EMAIL PROTECTED]>
+
+ * lib/krb5/get_cred.c: Add krb5_get_renewed_creds.
+
+ * lib/krb5/krb5_get_credentials.3: add krb5_get_renewed_creds
+
+ * lib/krb5/pkinit.c: Use hx509_cms_unwrap_ContentInfo.
+
2007-06-25 Love H�rnquist �strand <[EMAIL PROTECTED]>
* doc/setup.texi: Add example for pkinit_win2k_require_binding
Modified: trunk/heimdal/lib/hx509/ChangeLog
===
--- trunk/heimdal/lib/hx509/ChangeLog 2007-06-26 10:27:40 UTC (rev 759)
+++ trunk/heimdal/lib/hx509/ChangeLog 2007-06-26 11:15:08 UTC (rev 760)
@@ -1,3 +1,11 @@
+2007-06-26 Love H�rnquist �strand <[EMAIL PROTECTED]>
+
+ * version-script.map: Export more crap^W semiprivate functions.
+
+ * hxtool.c: don't _hx509_abort
+
+ * version-script.map: add missing ;
+
2007-06-25 Love H�rnquist �strand <[EMAIL PROTECTED]>
* cms.c: Use hx509_crypto_random_iv.
Modified: trunk/heimdal/lib/hx509/hxtool.c
===
--- trunk/heimdal/lib/hx509/hxtool.c2007-06-26 10:27:40 UTC (rev 759)
+++ trunk/heimdal/lib/hx509/hxtool.c2007-06-26 11:15:08 UTC (rev 760)
@@ -32,7 +32,7 @@
*/
#include "hx_locl.h"
-RCSID("$Id: hxtool.c 21312 2007-06-25 18:27:28Z lha $");
+RCSID("$Id: hxtool.c 21330 2007-06-26 11:09:55Z lha $");
#include
#include
@@ -1917,7 +1917,8 @@
lock_strings(lock, &opt->pass_strings);
ret = hx509_crl_alloc(context, &crl);
-if (ret) _hx509_abort("hx509_crl_alloc");
+if (ret)
+ errx(1, "crl alloc");
if (opt->signer_string == NULL)
errx(1, "signer missing");
Modified: trunk/heimdal/lib/hx509/version-script.map
===
--- trunk/heimdal/lib/hx509/version-script.map 2007-06-26 10:27:40 UTC (rev
759)
+++ trunk/heimdal/lib/hx509/version-script.map 2007-06-26 11:15:08 UTC (rev
760)
@@ -183,10 +183,36 @@
hx509_verify_set_time;
hx509_verify_signature;
hx509_pem_write;
+ hx509_pem_add_header;
+ hx509_pem_find_header;
+ hx509_pem_free_header;
+ _hx509_write_file;
_hx509_map_file;
_hx509_map_file_os;
_hx509_unmap_file;
_hx509_unmap_file_os;
+ _hx509_certs_keys_free;
+ _hx509_certs_keys_get;
+ _hx509_request_init;
+ _hx509_request_set_name;
+ _hx509_request_set_email;
+ _hx509_request_set_SubjectPublicKeyInfo;
+ _hx509_request_to_pkcs10;
+ _hx509_request_to_pkcs10;
+ _hx509_request_free;
+ _hx509_private_key_ref;
+ _hx509_private_key_free;
+ _hx509_private_key2SPKI;
+ _hx509_generate_private_key_init;
+ _hx509_generate_private_key_is_ca;
+ _hx509_generate_private_key_bits;
+ _hx509_generate_private_key;
+ _hx509_generate_private_key_free;
+ _hx509_cert_assign_key;
+ _hx509_cert_private_key;
+ _hx509_name_from_Name;
+ decode_CertificationRequest;
+ free_CertificationRequest;
local:
*;
};
Modified: trunk/heimdal/lib/krb5/get_cred.c
===
--- trunk/heimdal/lib/krb5/get_cred.c 2007-06-26 10:27:40 UTC (rev 759)
+++ trunk/heimdal/lib/krb5/get_cred.c 2007-06-26 11:15:08 UTC (rev 760)
@@ -33,7 +33,7 @@
#include
-RCSID("$Id: get_cred.c 21253 2007-06-21 04:24:24Z lha $");
+RCSID("$Id: get_cred.c 21327 2007-06-26 10:54:15Z lha $");
/*
* Take the `body' and encode it into `padata' using the credentials
@@ -1210,3 +1210,62 @@
krb5_cc_store_cred(context, ccache, *out_creds);
return ret;
}
+
+/*
+ *
+ */
+
+krb5_error_code KRB5_LIB_FUNCTION
+krb5_get_renewed_creds(krb5_context context,
+ krb5_creds *creds,
+ krb5_const_principal client,
+ krb5_ccache ccache,
+ const ch
svn commit: lorikeet r759 - in trunk/heimdal/lib/hx509: .
Author: lha Date: 2007-06-26 10:27:40 + (Tue, 26 Jun 2007) New Revision: 759 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=759 Log: Merged with Heimdal svn revision 21325 Modified: trunk/heimdal/lib/hx509/version-script.map Changeset: Modified: trunk/heimdal/lib/hx509/version-script.map === --- trunk/heimdal/lib/hx509/version-script.map 2007-06-26 08:54:28 UTC (rev 758) +++ trunk/heimdal/lib/hx509/version-script.map 2007-06-26 10:27:40 UTC (rev 759) @@ -33,7 +33,7 @@ hx509_cert_find_subjectAltName_otherName; hx509_cert_free; hx509_cert_get_SPKI; - hx509_cert_attribute + hx509_cert_attribute; hx509_cert_get_attribute; hx509_cert_get_base_subject; hx509_cert_get_friendly_name; @@ -45,7 +45,7 @@ hx509_cert_init; hx509_cert_init_data; hx509_cert_keyusage_print; - hx509_cert + hx509_cert; hx509_cert_ref; hx509_cert_set_friendly_name; hx509_certs_add;
svn commit: samba r23609 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_26/source/libsmb
Author: gd
Date: 2007-06-26 10:19:06 + (Tue, 26 Jun 2007)
New Revision: 23609
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23609
Log:
Removing more redundant codepaths out of smb_krb5_renew_ticket().
Thanks Volker for the pointer hint :)
Guenther
Modified:
branches/SAMBA_3_0/source/libsmb/clikrb5.c
branches/SAMBA_3_0_26/source/libsmb/clikrb5.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-06-26 09:41:14 UTC (rev
23608)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-06-26 10:19:06 UTC (rev
23609)
@@ -1140,7 +1140,11 @@
krb5_context context = NULL;
krb5_ccache ccache = NULL;
krb5_principal client = NULL;
+ krb5_creds creds, creds_in, *creds_out = NULL;
+ ZERO_STRUCT(creds);
+ ZERO_STRUCT(creds_in);
+
initialize_krb5_error_table();
ret = krb5_init_context(&context);
if (ret) {
@@ -1178,39 +1182,17 @@
#ifdef HAVE_KRB5_GET_RENEWED_CREDS /* MIT */
{
- krb5_creds creds;
-
- ZERO_STRUCT(creds);
-
ret = krb5_get_renewed_creds(context, &creds, client, ccache,
CONST_DISCARD(char *, service_string));
if (ret) {
DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred
failed: %s\n", error_message(ret)));
goto done;
}
-
- /* hm, doesn't that create a new one if the old one wasn't
there? - Guenther */
- ret = krb5_cc_initialize(context, ccache, client);
- if (ret) {
- goto done;
- }
-
- ret = krb5_cc_store_cred(context, ccache, &creds);
-
- if (expire_time) {
- *expire_time = (time_t) creds.times.endtime;
- }
-
- krb5_free_cred_contents(context, &creds);
}
#elif defined(HAVE_KRB5_GET_KDC_CRED) /* Heimdal */
{
krb5_kdc_flags flags;
- krb5_creds creds_in;
- krb5_realm *client_realm;
- krb5_creds *creds;
+ krb5_realm *client_realm = NULL;
- ZERO_STRUCT(creds_in);
-
ret = krb5_copy_principal(context, client, &creds_in.client);
if (ret) {
goto done;
@@ -1237,33 +1219,39 @@
flags.i = 0;
flags.b.renewable = flags.b.renew = True;
- ret = krb5_get_kdc_cred(context, ccache, flags, NULL, NULL,
&creds_in, &creds);
+ ret = krb5_get_kdc_cred(context, ccache, flags, NULL, NULL,
&creds_in, &creds_out);
if (ret) {
DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred
failed: %s\n", error_message(ret)));
goto done;
}
-
- /* hm, doesn't that create a new one if the old one wasn't
there? - Guenther */
- ret = krb5_cc_initialize(context, ccache, creds_in.client);
- if (ret) {
- goto done;
- }
-
- ret = krb5_cc_store_cred(context, ccache, creds);
- if (expire_time) {
- *expire_time = (time_t) creds->times.endtime;
- }
-
- krb5_free_cred_contents(context, &creds_in);
- krb5_free_creds(context, creds);
+ creds = *creds_out;
}
#else
#error NO_SUITABLE_KRB5_TICKET_RENEW_FUNCTION_AVAILABLE
#endif
+ /* hm, doesn't that create a new one if the old one wasn't there? -
Guenther */
+ ret = krb5_cc_initialize(context, ccache, client);
+ if (ret) {
+ goto done;
+ }
+
+ ret = krb5_cc_store_cred(context, ccache, &creds);
+ if (expire_time) {
+ *expire_time = (time_t) creds.times.endtime;
+ }
+
done:
+ krb5_free_cred_contents(context, &creds_in);
+
+ if (creds_out) {
+ krb5_free_creds(context, creds_out);
+ } else {
+ krb5_free_cred_contents(context, &creds);
+ }
+
if (client) {
krb5_free_principal(context, client);
}
Modified: branches/SAMBA_3_0_26/source/libsmb/clikrb5.c
===
--- branches/SAMBA_3_0_26/source/libsmb/clikrb5.c 2007-06-26 09:41:14 UTC
(rev 23608)
+++ branches/SAMBA_3_0_26/source/libsmb/clikrb5.c 2007-06-26 10:19:06 UTC
(rev 23609)
@@ -1140,7 +1140,11 @@
krb5_context context = NULL;
krb5_ccache ccache = NULL;
krb5_principal client = NULL;
+ krb5_creds creds, creds_in, *creds_out = NULL;
+ ZERO_STRUCT(creds);
+ ZERO_STRUCT(creds_in);
+
i
svn commit: samba r23608 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: gd
Date: 2007-06-26 09:41:14 + (Tue, 26 Jun 2007)
New Revision: 23608
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23608
Log:
Just inline comment cosmetics.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
branches/SAMBA_3_0_26/source/nsswitch/idmap_ad.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap_ad.c 2007-06-26 09:15:37 UTC
(rev 23607)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ad.c 2007-06-26 09:41:14 UTC
(rev 23608)
@@ -680,7 +680,7 @@
*/
/
- Initialize the {sfu,rfc2307} state
+ Initialize the {sfu,sfu20,rfc2307} state
***/
static NTSTATUS nss_sfu_init( struct nss_domain_entry *e )
@@ -701,10 +701,6 @@
return NT_STATUS_OK;
}
-/
- Initialize the {sfu,rfc2307} state
- ***/
-
static NTSTATUS nss_sfu20_init( struct nss_domain_entry *e )
{
/* Sanity check if we have previously been called with a
@@ -722,6 +718,7 @@
return NT_STATUS_OK;
}
+
static NTSTATUS nss_rfc2307_init( struct nss_domain_entry *e )
{
/* Sanity check if we have previously been called with a
Modified: branches/SAMBA_3_0_26/source/nsswitch/idmap_ad.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/idmap_ad.c2007-06-26 09:15:37 UTC
(rev 23607)
+++ branches/SAMBA_3_0_26/source/nsswitch/idmap_ad.c2007-06-26 09:41:14 UTC
(rev 23608)
@@ -680,7 +680,7 @@
*/
/
- Initialize the {sfu,rfc2307} state
+ Initialize the {sfu,sfu20,rfc2307} state
***/
static NTSTATUS nss_sfu_init( struct nss_domain_entry *e )
@@ -701,10 +701,6 @@
return NT_STATUS_OK;
}
-/
- Initialize the {sfu,rfc2307} state
- ***/
-
static NTSTATUS nss_sfu20_init( struct nss_domain_entry *e )
{
/* Sanity check if we have previously been called with a
@@ -722,6 +718,7 @@
return NT_STATUS_OK;
}
+
static NTSTATUS nss_rfc2307_init( struct nss_domain_entry *e )
{
/* Sanity check if we have previously been called with a
Re: svn commit: samba-docs r1128 - in trunk: manpages-3 smbdotconf/misc
On Tue, Jun 26, 2007 at 12:23:41PM +0400, Alexander Bokovoy wrote: > [EMAIL PROTECTED] пишет: > > Author: obnox > > Date: 2007-06-26 08:11:40 + (Tue, 26 Jun 2007) > > New Revision: 1128 > > > > WebSVN: > > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1128 > > > > Log: > > Fix a couple of tags. > > It is a little cumbersome for me to debug my manpage-sourcecode > > since I can only see useful output once It is on > > http://samba.org/~samba-bugs/docs/ ... :-/ > > (I have not yet come across a system that can produce readable > > manpage output from the source.) > A regular Ubuntu setup should be OK to generate manpages from our > documentation build system. Ok thanks, I will try that! (And maybe see, what is the problem on all the debian and suse systems i tried... :-) Michael -- Michael Adam <[EMAIL PROTECTED]> SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.SerNet.DE, mailto: Info @ SerNet.DE
svn commit: samba r23607 - in branches: SAMBA_3_0/source SAMBA_3_0/source/include SAMBA_3_0/source/libads SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source SAMBA_3_0_26/source/include SAMBA_3_0_26/source/
Author: gd Date: 2007-06-26 09:15:37 + (Tue, 26 Jun 2007) New Revision: 23607 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23607 Log: Add legacy support for Services for Unix (SFU) 2.0. Guenther Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/ads.h branches/SAMBA_3_0/source/libads/ldap_schema.c branches/SAMBA_3_0/source/nsswitch/idmap_ad.c branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/include/ads.h branches/SAMBA_3_0_26/source/libads/ldap_schema.c branches/SAMBA_3_0_26/source/nsswitch/idmap_ad.c Changeset: Sorry, the patch is too large (597 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23607
svn commit: samba r23606 - in branches: SAMBA_3_0/source/script SAMBA_3_0_26/source/script
Author: kai
Date: 2007-06-26 09:10:30 + (Tue, 26 Jun 2007)
New Revision: 23606
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23606
Log:
Merge Samba4 mkversion.sh to Samba3.
Modified:
branches/SAMBA_3_0/source/script/mkversion.sh
branches/SAMBA_3_0_26/source/script/mkversion.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/mkversion.sh
===
--- branches/SAMBA_3_0/source/script/mkversion.sh 2007-06-26 06:04:14 UTC
(rev 23605)
+++ branches/SAMBA_3_0/source/script/mkversion.sh 2007-06-26 09:10:30 UTC
(rev 23606)
@@ -16,12 +16,19 @@
SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
+
SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p'
$SOURCE_DIR$VERSION_FILE`
+
+SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
+
SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p'
$SOURCE_DIR$VERSION_FILE`
+
+SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p'
$SOURCE_DIR$VERSION_FILE`
+
SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p'
$SOURCE_DIR$VERSION_FILE`
-SAMBA_VENDOR_PATCH=`sed -n 's/^SAMBA_VENDOR_PATCH=//p'
$SOURCE_DIR$VERSION_FILE`
+SAMBA_VERSION_VENDOR_PATCH=`sed -n 's/^SAMBA_VERSION_VENDOR_PATCH=//p'
$SOURCE_DIR$VERSION_FILE`
echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE
@@ -37,12 +44,15 @@
##
-## maybe add "3.0.22a" or "3.0.22pre1" or "3.0.22rc1"
+## maybe add "3.0.22a" or "4.0.0tp11" or "3.0.22pre1" or "3.0.22rc1"
## We do not do pre or rc version on patch/letter releases
##
if test -n "${SAMBA_VERSION_REVISION}";then
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >>
$OUTPUT_FILE
+elif test -n "${SAMBA_VERSION_TP_RELEASE}";then
+SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}"
+echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >>
$OUTPUT_FILE
elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
## maybe add "3.0.22pre2"
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
@@ -53,70 +63,123 @@
fi
##
-## Add the vendor string if present
-##
-if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}"
>> $OUTPUT_FILE
-if test -n "${SAMBA_VENDOR_PATCH}";then
-echo "#define SAMBA_VENDOR_PATCH ${SAMBA_VENDOR_PATCH}" >> $OUTPUT_FILE
-fi
-fi
-
-
-
-##
## SVN revision number?
##
if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
_SAVE_LANG=${LANG}
LANG=""
-HAVESVN=no
-svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
-TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info
${SOURCE_DIR} 2>/dev/null) |grep 'Last Changed Rev.*:' |sed -e 's/Last Changed
Rev.*: \([0-9]*\).*/\1/'`
-if test x"${HAVESVN}" = x"no";then
+HAVEVER="no"
+
+if test x"${HAVEVER}" != x"yes";then
+ HAVESVN=no
+ SVN_INFO=`svn info ${SOURCE_DIR} 2>/dev/null`
+ TMP_REVISION=`echo -e "${SVN_INFO}" | grep 'Last Changed Rev.*:' |sed
-e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
+ if test -n "$TMP_REVISION"; then
+ HAVESVN=yes
+ HAVEVER=yes
+ fi
+fi
+
+if test x"${HAVEVER}" != x"yes";then
HAVESVK=no
- svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
- TMP_MIRRORED_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null) |grep
'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..*
\([0-9]*\).*/\1/'`
+ SVK_INFO=`svk info ${SOURCE_DIR} 2>/dev/null`
+ TMP_REVISION=`echo -e "${SVK_INFO}" | grep 'Last Changed Rev.*:' |sed
-e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
+ if test -n "$TMP_REVISION"; then
+ HAVESVK=yes
+ HAVEVER=yes
+ fi
+ TMP_MIRRORED_REVISION=`echo -e "${SVK_INFO}" | grep 'Mirrored
From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'`
+fi
+
+if test x"${HAVEVER}" != x"yes";then
+ HAVEBZR=no
+ BZR_INFO=`bzr version-info --check-clean ${SOURCE_DIR} 2>/dev/null`
+ TMP_REVISION=`echo -e "${BZR_INFO}" | grep 'revno:' |sed -e 's/revno:
\([0-9]*\).*/\1/'`
+ if test -n "$TMP_REVISION"; then
+ HAVEBZR=yes
+ HAVEVER=yes
+ fi
+ TMP_MIRRORED_REVISION=`echo -e "${BZR_INFO}" | grep 'revision-id:
svn-v1:[EMAIL PROTECTED]'
svn commit: lorikeet r758 - in trunk/heimdal: . doc kdc lib/hx509 lib/krb5 lib/ntlm tests tests/gss tests/kdc
Author: lha Date: 2007-06-26 08:54:28 + (Tue, 26 Jun 2007) New Revision: 758 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=758 Log: Merged with Heimdal svn revision 21323 Added: trunk/heimdal/lib/hx509/version-script.map Modified: trunk/heimdal/ChangeLog trunk/heimdal/doc/setup.texi trunk/heimdal/kdc/default_config.c trunk/heimdal/kdc/kdc.h trunk/heimdal/kdc/krb5tgs.c trunk/heimdal/kdc/pkinit.c trunk/heimdal/lib/hx509/ChangeLog trunk/heimdal/lib/hx509/Makefile.am trunk/heimdal/lib/hx509/cert.c trunk/heimdal/lib/hx509/cms.c trunk/heimdal/lib/hx509/crypto.c trunk/heimdal/lib/hx509/file.c trunk/heimdal/lib/hx509/hx509.h trunk/heimdal/lib/hx509/hxtool-commands.in trunk/heimdal/lib/hx509/hxtool.c trunk/heimdal/lib/hx509/ks_file.c trunk/heimdal/lib/hx509/test_ca.in trunk/heimdal/lib/hx509/test_cert.in trunk/heimdal/lib/hx509/test_chain.in trunk/heimdal/lib/hx509/test_cms.in trunk/heimdal/lib/krb5/pkinit.c trunk/heimdal/lib/krb5/principal.c trunk/heimdal/lib/ntlm/ntlm.c trunk/heimdal/tests/ChangeLog trunk/heimdal/tests/gss/check-context.in trunk/heimdal/tests/kdc/check-referral.in Changeset: Sorry, the patch is too large (2711 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=758
Re: svn commit: samba-docs r1128 - in trunk: manpages-3 smbdotconf/misc
[EMAIL PROTECTED] пишет: > Author: obnox > Date: 2007-06-26 08:11:40 + (Tue, 26 Jun 2007) > New Revision: 1128 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1128 > > Log: > Fix a couple of tags. > It is a little cumbersome for me to debug my manpage-sourcecode > since I can only see useful output once It is on > http://samba.org/~samba-bugs/docs/ ... :-/ > (I have not yet come across a system that can produce readable > manpage output from the source.) A regular Ubuntu setup should be OK to generate manpages from our documentation build system. -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
svn commit: samba-docs r1128 - in trunk: manpages-3 smbdotconf/misc
Author: obnox Date: 2007-06-26 08:11:40 + (Tue, 26 Jun 2007) New Revision: 1128 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1128 Log: Fix a couple of tags. It is a little cumbersome for me to debug my manpage-sourcecode since I can only see useful output once It is on http://samba.org/~samba-bugs/docs/ ... :-/ (I have not yet come across a system that can produce readable manpage output from the source.) Michael Modified: trunk/manpages-3/smb.conf.5.xml trunk/smbdotconf/misc/include.xml trunk/smbdotconf/misc/registryshares.xml Changeset: Modified: trunk/manpages-3/smb.conf.5.xml === --- trunk/manpages-3/smb.conf.5.xml 2007-06-22 22:44:13 UTC (rev 1127) +++ trunk/manpages-3/smb.conf.5.xml 2007-06-26 08:11:40 UTC (rev 1128) @@ -724,17 +724,18 @@ Share definitions stored in registry are used. This is triggered by setting the global parameter registry shares to - yes in smb.conf. + yes in smb.conf. - Note: Shares defined in smb.conf always take priority over + + Note: Shares defined in smb.conf always take priority over shares of the same name defined in registry. - Global smb.conf options stored in + Global smb.conf options stored in registry are used. This is triggered by a new special meaning of the - parameter include = registry in - the [global] section of smb.conf. + parameter registry in + the [global] section of smb.conf. This reads the content of the global configuration section from the regsitry and includes the result with the same priorities as @@ -746,7 +747,7 @@ Even when global registry options are used, the initial source of - configuration is still the smb.conf file. + configuration is still the smb.conf file. It is this possible though, to produce a registry-only configuration with a minimal configuration file like this: @@ -755,8 +756,10 @@ This is also currently the only supported configuration with global registry options activated. More precisely, it is only supported to - specify options in smb.conf before the - occurrence of include = registry. + specify options in smb.conf + before the + occurrence of + registry. @@ -769,22 +772,24 @@ do not see the configuration they loaded once it is active. This phenomenon can of course also be triggered by specifying lock directory after the - include = registry directive. This is why + registry directive. + This is why this type of configuration is classified "unsupported" above. The registry configuration can be accessed with - tools like regedit or net rpc - registry in the key - HKLM\Software\Samba\smbconf. + tools like regedit or net rpc + registry in the key + HKLM\Software\Samba\smbconf. - More conveniently, the conf subcommand of the + More conveniently, the conf subcommand of the net 7 utility offers a dedicated interface to read and write the registry based configuration locally, i.e. directly - on the server. + accessing the database file, circumventing the + server. Modified: trunk/smbdotconf/misc/include.xml === --- trunk/smbdotconf/misc/include.xml 2007-06-22 22:44:13 UTC (rev 1127) +++ trunk/smbdotconf/misc/include.xml 2007-06-26 08:11:40 UTC (rev 1128) @@ -15,9 +15,10 @@ - The parameter include = registry has + Since Samba version 3.0.26, setting + registry has a special meaning: It does not include - a file named registry from the current working + a file named registry from the current working directory, but instead reads the global configuration options from the registry. See the section on registry-based configuration for details. Note that this option Modified: trunk/smbdotconf/misc/registryshares.xml === --- trunk/smbdotconf/misc/registryshares.xml2007-06-22 22:44:13 UTC (rev 1127) +++ trunk/smbdotconf/misc/registryshares.xml2007-06-26 08:1
