From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 14 May 2001 18:01:22 +0000 (+0000)
Subject: Update 1.2 stuff from laptop.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7742512115024b74dbc56920b4f5271d2b19481c;p=thirdparty%2Fcups.git

Update 1.2 stuff from laptop.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@1721 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/notifier/Makefile b/notifier/Makefile
index 6904bdce2a..a81ee6846a 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.1.2.1 2001/04/02 19:53:14 mike Exp $"
+# "$Id: Makefile,v 1.1.2.2 2001/05/14 18:01:22 mike Exp $"
 #
 #   Notifier makefile for the Common UNIX Printing System (CUPS).
 #
@@ -24,8 +24,8 @@
 
 include ../Makedefs
 
-TARGETS =	mailto
-OBJS	=	mailto.o
+TARGETS =	indp ippget mailto
+OBJS	=	indp.o ippget.o mailto.o
 
 
 #
@@ -54,6 +54,30 @@ install:
 	$(INSTALL_BIN) $(TARGETS) $(SERVERBIN)/notifier
 
 
+#
+# indp
+#
+
+indp:	indp.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o indp indp.o $(LIBS)
+
+indp.o:	../cups/cups.h ../cups/ipp.h ../cups/language.h	\
+		../cups/string.h
+
+
+#
+# ippget
+#
+
+ippget:	ippget.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o ippget ippget.o $(LIBS)
+
+ippget.o:	../cups/cups.h ../cups/ipp.h ../cups/language.h	\
+		../cups/string.h
+
+
 #
 # mailto
 #
@@ -69,5 +93,5 @@ mailto.o:	../cups/cups.h ../cups/ipp.h ../cups/language.h	\
 $(OBJS):	../config.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.1.2.1 2001/04/02 19:53:14 mike Exp $".
+# End of "$Id: Makefile,v 1.1.2.2 2001/05/14 18:01:22 mike Exp $".
 #
diff --git a/scheduler/client.c b/scheduler/client.c
index 5301067fa0..6fee41f944 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.91.2.2 2001/05/13 18:38:34 mike Exp $"
+ * "$Id: client.c,v 1.91.2.3 2001/05/14 18:01:22 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -719,6 +719,8 @@ ReadClient(client_t *con)	/* I - Client to read from */
 	httpPrintf(HTTP(con), "\r\n");
 
         EncryptClient(con);
+
+	status = IsAuthorized(con);
 #else
 	if (!SendError(con, HTTP_NOT_IMPLEMENTED))
 	{
@@ -728,7 +730,7 @@ ReadClient(client_t *con)	/* I - Client to read from */
 #endif /* HAVE_LIBSSL */
       }
 
-      if ((status = IsAuthorized(con)) != HTTP_OK)
+      if (status != HTTP_OK)
       {
 	SendError(con, status);
 	CloseClient(con);
@@ -2132,5 +2134,5 @@ pipe_command(client_t *con,	/* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.91.2.2 2001/05/13 18:38:34 mike Exp $".
+ * End of "$Id: client.c,v 1.91.2.3 2001/05/14 18:01:22 mike Exp $".
  */