[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5146-gfecb980

[Günther Deschner]

The branch, v3-3-test has been updated
       via  fecb980bc90ba4be1fa95b4a6e2aa6967d036656 (commit)
       via  69a8eeb16af7cccdaa524dd85c7e2b648c0547a3 (commit)
      from  ddcf94787f59cf682c51010b87d3624bbdd6b4a3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit fecb980bc90ba4be1fa95b4a6e2aa6967d036656
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 16 01:51:09 2009 +0100

    fix build on old Heimdal based systems
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)

commit 69a8eeb16af7cccdaa524dd85c7e2b648c0547a3
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 23 11:43:32 2009 +0100

    s3-spoolss: fix notify_printer_status_byname.
    
    This took me almost a week to find, so here a little longer explanation:
    
    When a windows client registers printer *status* change notifies using
    spoolss_RemoteFindFirstChangeNotify, it registers them to a print server handle,
    not a printer handle. We were then correctly monitoring the printer status
    changes but were sending out the spoolss_RouterReplyPrinterEx via the back-channel
    connection with job_id set to 0 (which we only may do for monitored printer
    change status notifies on printer handlers, not print server handles). Windows
    was then showing a new empty dummy printer icon in the explorer as it cannot
    route the notify event to the approriate local handle. It also discarded the
    content of the notify event message of course. With this, printer change notify for
    pausing, resuming and purging printers nicely works again here.
    
    Jerry, Tim and all other printing gurus, please check.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/libads/krb5_errs.c |    8 +++-----
 source/printing/notify.c  |    4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/krb5_errs.c b/source/libads/krb5_errs.c
index 53023cc..0e03ebb 100644
--- a/source/libads/krb5_errs.c
+++ b/source/libads/krb5_errs.c
@@ -30,12 +30,10 @@ static const struct {
 	{KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCESS_DENIED},
 	{KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
 	{KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
-#if defined(KRB5KDC_ERR_KEY_EXPIRED) /* Heimdal */
-	{KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
-#elif defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
+#if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
 	{KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
-#else 
-#error Neither KRB5KDC_ERR_KEY_EXPIRED nor KRB5KDC_ERR_KEY_EXP available
+#else /* old Heimdal releases have it with different name only in an enum: */
+	{KRB5KDC_ERR_KEY_EXPIRED, NT_STATUS_PASSWORD_EXPIRED},
 #endif
 	{25, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: bug in heimdal 0.7 krb5_get_init_creds_password (Inappropriate ioctl for device (25)) */
 	{KRB5KDC_ERR_NULL_KEY, NT_STATUS_LOGON_FAILURE},
diff --git a/source/printing/notify.c b/source/printing/notify.c
index 860a400..e54b308 100644
--- a/source/printing/notify.c
+++ b/source/printing/notify.c
@@ -394,8 +394,10 @@ void notify_printer_status_byname(const char *sharename, uint32 status)
 {
 	/* Printer status stored in value1 */
 
+	int snum = print_queue_snum(sharename);
+
 	send_notify_field_values(sharename, PRINTER_NOTIFY_TYPE, 
-				 PRINTER_NOTIFY_STATUS, 0, 
+				 PRINTER_NOTIFY_STATUS, snum,
 				 status, 0, 0);
 }
 


-- 
Samba Shared Repository