From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 17 Apr 2003 23:10:35 +0000 (+0000)
Subject: Mirror 1.1.x changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69d2b731e61fbfa1f2afa03e469dba79d76502d1;p=thirdparty%2Fcups.git

Mirror 1.1.x changes.

Partial policy code update.


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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index a32fb9a539..ff810527fb 100644
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,7 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19rc2
 
+	- The static cupsimage library was not built by default.
 	- The path for the "ln" command was hardcoded in
 	  Makedefs.in instead of being checked at configure time
 	  (STR #28).
diff --git a/filter/Makefile b/filter/Makefile
index dcce8c2c32..214d62a1fe 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.41.2.22 2003/03/30 21:49:14 mike Exp $"
+# "$Id: Makefile,v 1.41.2.23 2003/04/17 23:10:34 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -27,7 +27,8 @@
 include ../Makedefs
 
 FILTERS	=	gziptoany hpgltops texttops pstops imagetops imagetoraster \
-		rastertodymo rastertoepson rastertohp rastertortl
+		rastertodymo rastertoepson rastertohp rastertortl \
+		libcupsimage.a
 TARGETS	=	$(FILTERS) testraster
 
 HPGLOBJS =	hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
@@ -288,5 +289,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.41.2.22 2003/03/30 21:49:14 mike Exp $".
+# End of "$Id: Makefile,v 1.41.2.23 2003/04/17 23:10:34 mike Exp $".
 #
diff --git a/scheduler/policy.c b/scheduler/policy.c
index 5bb5927ce9..f5995a1fcb 100644
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.c,v 1.1.2.3 2003/01/07 18:27:26 mike Exp $"
+ * "$Id: policy.c,v 1.1.2.4 2003/04/17 23:10:35 mike Exp $"
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
@@ -77,7 +77,7 @@ AddPolicy(const char *policy)		/* I - Name of policy */
     NumPolicies ++;
 
     memset(temp, 0, sizeof(policy_t));
-    strlcpy(temp->name, policy, sizeof(temp->name));
+    temp->name           = strdup(policy);
     temp->default_result = 1;
   }
 
@@ -332,6 +332,7 @@ check_group(const char *username,	/* I - Authenticated username */
   int			i;		/* Looping var */
   struct passwd		*user;		/* User info */
   struct group		*group;		/* System group info */
+  char			junk[33];	/* MD5 password (not used) */
 
 
   LogMessage(L_DEBUG2, "check_group(%s, %s)\n", username, groupname);
@@ -373,9 +374,14 @@ check_group(const char *username,	/* I - Authenticated username */
     return (1);
 
  /*
-  * TODO: Check the lppasswd user:group mapping...
+  * Username not found, group not found, or user is not part of the
+  * system group...  Check for a user and group in the MD5 password
+  * file...
   */
 
+  if (GetMD5Passwd(username, groupname, junk) != NULL)
+    return (1);
+
  /*
   * If we get this far, then the user isn't part of the named group...
   */
@@ -385,5 +391,5 @@ check_group(const char *username,	/* I - Authenticated username */
 
 
 /*
- * End of "$Id: policy.c,v 1.1.2.3 2003/01/07 18:27:26 mike Exp $".
+ * End of "$Id: policy.c,v 1.1.2.4 2003/04/17 23:10:35 mike Exp $".
  */
diff --git a/scheduler/policy.h b/scheduler/policy.h
index a3add4aa38..d3eb442c21 100644
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.h,v 1.1.2.4 2003/01/07 18:27:26 mike Exp $"
+ * "$Id: policy.h,v 1.1.2.5 2003/04/17 23:10:35 mike Exp $"
  *
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -54,7 +54,7 @@ typedef struct
 
 typedef struct
 {
-  char		name[IPP_MAX_NAME];	/* Policy name */
+  char		*name;			/* Policy name */
   int		default_result;		/* Default policy result */
   int		num_ops;		/* Number of operations */
   policyop_t	*ops;			/* Operations */
@@ -86,5 +86,5 @@ extern policyop_t	*FindPolicyOp(policy_t *p, ipp_op_t op);
 
 
 /*
- * End of "$Id: policy.h,v 1.1.2.4 2003/01/07 18:27:26 mike Exp $".
+ * End of "$Id: policy.h,v 1.1.2.5 2003/04/17 23:10:35 mike Exp $".
  */