- new yp.x uses "stat" where we used to use "status"... fun.

1 files changed, 25 insertions, 25 deletions

diff --git a/src/nis.c b/src/nis.c
index b7640c6..2b7b0f1 100644
--- a/src/nis.c
+++ b/src/nis.c
@@ -112,7 +112,7 @@ nis_match(struct plugin_state *state,
 			      &entry_id, NULL) &&
 		    (client_secure || !map_secure)) {
 			/* Success! */
-			reply_val->status = YP_TRUE;
+			reply_val->stat = YP_TRUE;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"match(%s/%s/%.*s) -> %d\n",
@@ -120,7 +120,7 @@ nis_match(struct plugin_state *state,
 					req_key.map,
 					(int) req_key.keydat.keydat_len,
 					req_key.keydat.keydat_val,
-					reply_val->status);
+					reply_val->stat);
 		} else {
 			/* Distinguish between no-such-key and no-such-map for
 			 * reporting the error.  We're making maps which the
@@ -128,7 +128,7 @@ nis_match(struct plugin_state *state,
 			map_supported = FALSE;
 			map_supports_map(state, req_key.domain, req_key.map,
 					 &map_supported, NULL);
-			reply_val->status = map_supported ? YP_NOKEY : YP_NOMAP;
+			reply_val->stat = map_supported ? YP_NOKEY : YP_NOMAP;
 		}
 		(*reply_fn)(state, cdata, reply, reply_xdrs);
 		map_unlock();
@@ -165,13 +165,13 @@ nis_first(struct plugin_state *state,
 			      &entry_id, &entry_key_index) &&
 		    (client_secure || !map_secure)) {
 			/* Success! */
-			reply_key_val->status = YP_TRUE;
+			reply_key_val->stat = YP_TRUE;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"first(%s/%s) -> %d\n",
 					req_nokey.domain,
 					req_nokey.map,
-					reply_key_val->status);
+					reply_key_val->stat);
 		} else {
 			/* Distinguish between no-such-key and no-such-map for
 			 * reporting the error.  We're making maps which the
@@ -179,8 +179,8 @@ nis_first(struct plugin_state *state,
 			map_supported = FALSE;
 			map_supports_map(state, req_nokey.domain, req_nokey.map,
 					 &map_supported, NULL);
-			reply_key_val->status = map_supported ? YP_NOKEY :
-								YP_NOMAP;
+			reply_key_val->stat = map_supported ? YP_NOKEY :
+							      YP_NOMAP;
 		}
 		(*reply_fn)(state, cdata, reply, reply_xdrs);
 		map_unlock();
@@ -215,7 +215,7 @@ nis_next(struct plugin_state *state,
 			     &reply_key_val->valdat.valdat_val) &&
 		    (client_secure || !map_secure)) {
 			/* Success! */
-			reply_key_val->status = YP_TRUE;
+			reply_key_val->stat = YP_TRUE;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"next(%s/%s/%.*s) -> %d\n",
@@ -223,7 +223,7 @@ nis_next(struct plugin_state *state,
 					req_key.map,
 					req_key.keydat.keydat_len,
 					req_key.keydat.keydat_val,
-					reply_key_val->status);
+					reply_key_val->stat);
 		} else {
 			/* Distinguish between no-next-key and no-this-key for
 			 * reporting the error so that the client can know when
@@ -238,7 +238,7 @@ nis_next(struct plugin_state *state,
 				      &entry_id, NULL) &&
 			    (client_secure || !map_secure)) {
 				/* Have data for this key, but not the next. */
-				reply_key_val->status = YP_NOMORE;
+				reply_key_val->stat = YP_NOMORE;
 				map_supported = TRUE;
 			} else {
 				/* No data for this key. Check if we even have
@@ -248,8 +248,8 @@ nis_next(struct plugin_state *state,
 						 req_key.domain,
 						 req_key.map,
 						 &map_supported, NULL);
-				reply_key_val->status = map_supported ?
-							YP_NOKEY : YP_NOMAP;
+				reply_key_val->stat = map_supported ?
+						      YP_NOKEY : YP_NOMAP;
 			}
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
@@ -291,7 +291,7 @@ nis_master(struct plugin_state *state,
 					     req_nokey.domain, req_nokey.map,
 					     &supported, NULL) &&
 			    supported) {
-				reply_master->status = YP_TRUE;
+				reply_master->stat = YP_TRUE;
 				if (map_master_name(state, &master) != 0) {
 					master = "localhost";
 				}
@@ -303,7 +303,7 @@ nis_master(struct plugin_state *state,
 						req_nokey.map,
 						reply_master->master);
 			} else {
-				reply_master->status = YP_NOMAP;
+				reply_master->stat = YP_NOMAP;
 				reply_master->master = NULL;
 				slapi_log_error(SLAPI_LOG_PLUGIN,
 						state->plugin_desc->spd_id,
@@ -312,7 +312,7 @@ nis_master(struct plugin_state *state,
 						req_nokey.map);
 			}
 		} else {
-			reply_master->status = YP_NODOM;
+			reply_master->stat = YP_NODOM;
 			reply_master->master = NULL;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
@@ -343,11 +343,11 @@ nis_order(struct plugin_state *state,
 	memset(reply_order, 0, sizeof(*reply_order));
 	if (xdr_ypreq_nokey(request_xdrs, &req_nokey)) {
 		map_rdlock();
-		reply_order->status = YP_TRUE;
+		reply_order->stat = YP_TRUE;
 		if (map_order(state, req_nokey.domain, req_nokey.map,
 			      &map_secure, &reply_order->ordernum) &&
 			      (client_secure || !map_secure)) {
-			reply_order->status = YP_TRUE;
+			reply_order->stat = YP_TRUE;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"order(%s/%s) -> %d\n",
@@ -355,7 +355,7 @@ nis_order(struct plugin_state *state,
 					req_nokey.map,
 					reply_order->ordernum);
 		} else {
-			reply_order->status = YP_FALSE;
+			reply_order->stat = YP_FALSE;
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"order(%s/%s) -> ?\n",
@@ -427,7 +427,7 @@ nis_maplist(struct plugin_state *state,
 		cbdata.list = NULL;
 		cbdata.client_secure = client_secure;
 		map_data_foreach_map(state, domain, nis_maplist_cb, &cbdata);
-		reply_maplist->status = YP_TRUE;
+		reply_maplist->stat = YP_TRUE;
 		reply_maplist->list = cbdata.list;
 		if (reply_maplist->list == NULL) {
 			slapi_log_error(SLAPI_LOG_PLUGIN,
@@ -555,7 +555,7 @@ nis_all(struct plugin_state *state,
 		    !map_supported) {
 			/* No entries? No-such-map final status. */
 			reply_all->more = TRUE;
-			reply_all->ypresp_all_u.val.status = YP_NOMAP;
+			reply_all->ypresp_all_u.val.stat = YP_NOMAP;
 			reply_key->keydat_len = 0;
 			reply_val->valdat_len = 0;
 			/* Encode the reply header so that we can queue the
@@ -624,7 +624,7 @@ nis_all(struct plugin_state *state,
 							reply_key->keydat_val);
 					skip = FALSE;
 					reply_all->more = TRUE;
-					reply_all->ypresp_all_u.val.status = YP_TRUE;
+					reply_all->ypresp_all_u.val.stat = YP_TRUE;
 					next_state = cookie_next;
 				} else {
 					/* Don't reply, just move to end-of-map
@@ -687,7 +687,7 @@ nis_all(struct plugin_state *state,
 					 * one. */
 					skip = FALSE;
 					reply_all->more = TRUE;
-					reply_all->ypresp_all_u.val.status = YP_TRUE;
+					reply_all->ypresp_all_u.val.stat = YP_TRUE;
 					next_state = cookie_next;
 				} else {
 					/* Don't reply, just move to end-of-map
@@ -754,7 +754,7 @@ nis_all(struct plugin_state *state,
 							cookie->key_index);
 					skip = FALSE;
 					reply_all->more = TRUE;
-					reply_all->ypresp_all_u.val.status = YP_TRUE;
+					reply_all->ypresp_all_u.val.stat = YP_TRUE;
 					next_state = cookie_next;
 				} else {
 					/* Don't reply, just move to end-of-map
@@ -794,7 +794,7 @@ nis_all(struct plugin_state *state,
 				memset(reply_key, 0, sizeof(*reply_key));
 				memset(reply_val, 0, sizeof(*reply_key));
 				reply_all->more = TRUE;
-				reply_all->ypresp_all_u.val.status = YP_NOMORE;
+				reply_all->ypresp_all_u.val.stat = YP_NOMORE;
 				slapi_log_error(SLAPI_LOG_PLUGIN,
 						state->plugin_desc->spd_id,
 						"all(%s/%s) no entries\n",
@@ -820,7 +820,7 @@ nis_all(struct plugin_state *state,
 				memset(reply_key, 0, sizeof(*reply_key));
 				memset(reply_val, 0, sizeof(*reply_key));
 				reply_all->more = TRUE;
-				reply_all->ypresp_all_u.val.status = YP_NOMORE;
+				reply_all->ypresp_all_u.val.stat = YP_NOMORE;
 				slapi_log_error(SLAPI_LOG_PLUGIN,
 						state->plugin_desc->spd_id,
 						"all(%s/%s) end-of-map\n",