*** group.c	Mon Sep  9 12:32:24 2002
--- /root/src/nss-mysql-0.43/src/group.c	Sat Jan 11 13:41:38 2003
***************
*** 114,138 ****
          
          if (q->name) {
                  /* we look by name */
!                 sql = _nss_mysql_sqlprintf("select %s,%s,%s,%s from %s "
                                  "LEFT JOIN %s on %s=%s LEFT JOIN %s on %s=%s "
!                                 "and %s where %s = '%s' and %s",
!                         goptions->groupnamecolumn,
!                         goptions->gidcolumn,
!                         goptions->passwordcolumn,
!                         options->usercolumn,
!                         /* from */
!                         goptions->groupinfotable,
!                         /* left join */
!                         goptions->memberstable,
!                         /* on */
!                         goptions->groupidcolumn,
!                         goptions->mgroupidcolumn,
!                         /* left join */
!                         options->table,
!                         /* on */
!                         goptions->museridcolumn,
!                         options->useridcolumn,
                          /* and */
                          options->where[0] ? options->where : "1=1",
                          /* where */
--- 114,140 ----
          
          if (q->name) {
                  /* we look by name */
!                 /* sql = _nss_mysql_sqlprintf("select %s,%s,%s,%s from %s "
                                  "LEFT JOIN %s on %s=%s LEFT JOIN %s on %s=%s "
!                                 "and %s where %s = '%s' and %s", */
! 		sql = _nss_mysql_sqlprintf("SELECT %s,%s,%s,%s FROM %s,%s,%s "
!                                                "WHERE %s = %s AND %s = %s AND %s AND %s = '%s' AND %s",
! 			goptions->groupnamecolumn,
! 			goptions->gidcolumn,
! 	                goptions->passwordcolumn,
! 		        options->usercolumn,
! 			/* from */
! 			goptions->groupinfotable,
! 			goptions->memberstable,
! 			options->table,
! 			/* where */
! 			goptions->groupidcolumn,
! 			/* = */
! 			goptions->mgroupidcolumn,
! 			/* AND */
! 			options->useridcolumn,
! 			/* = */
! 			goptions->museridcolumn,
                          /* and */
                          options->where[0] ? options->where : "1=1",
                          /* where */
***************
*** 143,170 ****
                          free(e_name);
          } else {
                  /* we look by GID */
!                 sql = _nss_mysql_sqlprintf("select %s,%s,%s,%s from %s "
!                                 "LEFT JOIN %s on %s=%s LEFT JOIN %s on %s=%s "
!                                 "and %s where %s = %d and %s",
                          goptions->groupnamecolumn,
                          goptions->gidcolumn,
                          goptions->passwordcolumn,
                          options->usercolumn,
                          /* from */
                          goptions->groupinfotable,
-                         /* left join */
                          goptions->memberstable,
!                         /* on */
                          goptions->groupidcolumn,
                          goptions->mgroupidcolumn,
!                         /* left join */
!                         options->table,
!                         /* on */
!                         goptions->museridcolumn,
                          options->useridcolumn,
!                         /* and */
!                         options->where[0] ? options->where : "1=1",
!                         /* where */
                          /* for bulk retrieval, we retrieve every entry */
                          q->bulk ? "1" : goptions->gidcolumn,
                          q->bulk ? 1 : q->gid,
--- 145,171 ----
                          free(e_name);
          } else {
                  /* we look by GID */
! /*                sql = _nss_mysql_sqlprintf("select %s,%s,%s,%s from %s "*/
! /*                                "LEFT JOIN %s on %s=%s LEFT JOIN %s on %s=%s "*/
! /*                                "and %s where %s = %d and %s",*/
! 		sql = _nss_mysql_sqlprintf("SELECT %s,%s,%s,%s FROM %s,%s,%s "
! 						"WHERE %s = %s AND %s = %s AND %s = %d",
                          goptions->groupnamecolumn,
                          goptions->gidcolumn,
                          goptions->passwordcolumn,
                          options->usercolumn,
                          /* from */
                          goptions->groupinfotable,
                          goptions->memberstable,
! 			options->table,
! 								/* where */
                          goptions->groupidcolumn,
+ 								/* = */
                          goptions->mgroupidcolumn,
!                         /* AND */
                          options->useridcolumn,
!                         /* = */
!                         goptions->museridcolumn,
                          /* for bulk retrieval, we retrieve every entry */
                          q->bulk ? "1" : goptions->gidcolumn,
                          q->bulk ? 1 : q->gid,